command line key to enable use of sync, disabled by default

browser/ui/brave_browser_command_controller.cc

@@ -4,8 +4,10 @@
 
 #include "brave/browser/ui/brave_browser_command_controller.h"
 
+#include "base/command_line.h"
 #include "brave/app/brave_command_ids.h"
 #include "brave/browser/ui/brave_pages.h"
+#include "brave/common/brave_switches.h"
 #include "brave/components/brave_rewards/browser/buildflags/buildflags.h"
 #include "brave/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser.h"
@@ -78,7 +80,11 @@ void BraveBrowserCommandController::InitBraveCommandState() {
 #endif
   UpdateCommandForBraveAdblock();
   UpdateCommandForTor();
-  UpdateCommandForBraveSync();
+  const base::CommandLine& command_line =
+      *base::CommandLine::ForCurrentProcess();
+  if (command_line.HasSwitch(switches::kEnableBraveSync)) {
+    UpdateCommandForBraveSync();
+  }
 }
 
 void BraveBrowserCommandController::UpdateCommandForBraveRewards() {

browser/ui/toolbar/brave_app_menu_model.cc

@@ -4,7 +4,9 @@
 
 #include "brave/browser/ui/toolbar/brave_app_menu_model.h"
 
+#include "base/command_line.h"
 #include "brave/app/brave_command_ids.h"
+#include "brave/common/brave_switches.h"
 #include "brave/grit/brave_generated_resources.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/profiles/profile.h"
@@ -43,8 +45,12 @@ void BraveAppMenuModel::InsertBraveMenuItems() {
         IDC_NEW_OFFTHERECORD_WINDOW_TOR,
         IDS_NEW_OFFTHERECORD_WINDOW_TOR);
   }
-  InsertItemWithStringIdAt(
-      GetIndexOfCommandId(IDC_SHOW_BRAVE_REWARDS),
-      IDC_SHOW_BRAVE_SYNC,
-      IDS_SHOW_BRAVE_SYNC);
+  const base::CommandLine& command_line =
+      *base::CommandLine::ForCurrentProcess();
+  if (command_line.HasSwitch(switches::kEnableBraveSync)) {
+    InsertItemWithStringIdAt(
+        GetIndexOfCommandId(IDC_SHOW_BRAVE_REWARDS),
+        IDC_SHOW_BRAVE_SYNC,
+        IDS_SHOW_BRAVE_SYNC);
+  }
 }

browser/ui/webui/brave_web_ui_controller_factory.cc

@@ -4,11 +4,13 @@
 
 #include "brave/browser/ui/webui/brave_web_ui_controller_factory.h"
 
+#include "base/command_line.h"
 #include "brave/browser/ui/webui/brave_adblock_ui.h"
 #include "brave/browser/ui/webui/brave_md_settings_ui.h"
 #include "brave/browser/ui/webui/brave_new_tab_ui.h"
 #include "brave/browser/ui/webui/brave_welcome_ui.h"
 #include "brave/browser/ui/webui/sync/sync_ui.h"
+#include "brave/common/brave_switches.h"
 #include "brave/common/webui_url_constants.h"
 #include "brave/components/brave_rewards/browser/buildflags/buildflags.h"
 #include "chrome/common/url_constants.h"
@@ -38,7 +40,10 @@ WebUIController* NewWebUI(WebUI* web_ui, const GURL& url) {
 template<>
 WebUIController* NewWebUI<BasicUI>(WebUI* web_ui, const GURL& url) {
   auto host = url.host_piece();
-  if (host == kBraveUISyncHost) {
+  const base::CommandLine& command_line =
+      *base::CommandLine::ForCurrentProcess();
+  if (host == kBraveUISyncHost &&
+                          command_line.HasSwitch(switches::kEnableBraveSync)) {
     return new SyncUI(web_ui, url.host());
   } else
   if (host == kAdblockHost) {
@@ -64,6 +69,8 @@ WebUIController* NewWebUI<BasicUI>(WebUI* web_ui, const GURL& url) {
 // with it.
 WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
                                              const GURL& url) {
+  const base::CommandLine& command_line =
+      *base::CommandLine::ForCurrentProcess();
   if (url.host_piece() == kAdblockHost ||
 #if BUILDFLAG(BRAVE_REWARDS_ENABLED)
       url.host_piece() == kRewardsHost ||
@@ -71,7 +78,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
 #endif
       url.host_piece() == kWelcomeHost ||
       url.host_piece() == kBraveUIWelcomeURL ||
-      url.host_piece() == kBraveUISyncHost ||
+      (url.host_piece() == kBraveUISyncHost &&
+          command_line.HasSwitch(switches::kEnableBraveSync)) ||
       url.host_piece() == chrome::kChromeUINewTabHost ||
       url.host_piece() == chrome::kChromeUISettingsHost) {
     return &NewWebUI<BasicUI>;

common/brave_switches.cc

@@ -26,6 +26,10 @@ const char kDisablePDFJSExtension[] = "disable-pdfjs-extension";
 // Allows disabling the Tor client updater extension.
 const char kDisableTorClientUpdaterExtension[] = "disable-tor-client-updater-extension";
 
+// Enables Brave Sync. For now it is targeted to staging for QA tests, so
+// is disabled by default for a while.
+const char kEnableBraveSync[] = "enable-brave-sync";
+
 // Specifies which server should we use for rewards
 // Valid values are: "stag" | "prod".
 const char kRewardsEnv[] = "rewards-env";

common/brave_switches.h

@@ -21,6 +21,8 @@ extern const char kDisablePDFJSExtension[];
 
 extern const char kDisableTorClientUpdaterExtension[];
 
+extern const char kEnableBraveSync[];
+
 extern const char kRewardsEnv[];
 
 extern const char kRewardsReconcileInterval[];
@@ -32,4 +34,3 @@ extern const char kUpgradeFromMuon[];
 }  // namespace switches
 
 #endif  // BRAVE_COMMON_BRAVE_SWITCHES_H_
-

components/brave_sync/brave_sync_service_impl.cc

@@ -321,11 +321,10 @@ void BraveSyncServiceImpl::OnGetInitData(const std::string& sync_version) {
 
   brave_sync::client_data::Config config;
   config.api_version = sync_prefs_->GetApiVersion();
-#if defined(OFFICIAL_BUILD)
-  config.server_url = "https://sync.brave.com";
-#else
+  // server_url should be switched to "https://sync.brave.com" once
+  // DEPS for "components/brave_sync/extension/brave-sync" will be
+  // switched to master
   config.server_url = "https://sync-staging.brave.com";
-#endif
   config.debug = true;
   sync_client_->SendGotInitData(seed, device_id, config, sync_words_);
 }