Merge pull request #943 from brave/sync-prod-unlock

Set sync to default enabled and provide "disable-brave-sync" switch
brave · Nov 22, 2018 · 2f0974c · 2f0974c
1 parent 6cff47f
commit 2f0974c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/common/brave_switches.cc b/common/brave_switches.cc
@@ -29,9 +29,8 @@ const char kDisableTorClientUpdaterExtension[] = "disable-tor-client-updater-ext
 // Allows disabling the WebTorrent extension.
 const char kDisableWebTorrentExtension[] = "disable-webtorrent-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";
+// Allows disabling Brave Sync.
+const char kDisableBraveSync[] = "disable-brave-sync";
 
 // Specifies which server should we use for rewards
 // Valid values are: "stag" | "prod".

diff --git a/common/brave_switches.h b/common/brave_switches.h
@@ -23,7 +23,7 @@ extern const char kDisableTorClientUpdaterExtension[];
 
 extern const char kDisableWebTorrentExtension[];
 
-extern const char kEnableBraveSync[];
+extern const char kDisableBraveSync[];
 
 extern const char kRewardsEnv[];
 

diff --git a/components/brave_sync/brave_sync_service.cc b/components/brave_sync/brave_sync_service.cc
@@ -24,10 +24,10 @@ void BraveSyncService::RemoveObserver(BraveSyncServiceObserver* observer) {
 bool BraveSyncService::is_enabled() {
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
-  if (command_line.HasSwitch(switches::kEnableBraveSync))
-    return true;
-  else
+  if (command_line.HasSwitch(switches::kDisableBraveSync))
     return false;
+  else
+    return true;
 }
 
 }  // namespace brave_sync
diff --git a/components/brave_sync/brave_sync_service_unittest.cc b/components/brave_sync/brave_sync_service_unittest.cc
@@ -2,10 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "base/command_line.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/strings/utf_string_conversions.h"
-#include "brave/common/brave_switches.h"
 #include "brave/components/brave_sync/client/bookmark_change_processor.h"
 #include "brave/components/brave_sync/client/brave_sync_client_impl.h"
 #include "brave/components/brave_sync/client/client_ext_impl_data.h"
@@ -255,8 +253,6 @@ TEST_F(BraveSyncServiceTest, OnSetupSyncNewToSync) {
 }
 
 TEST_F(BraveSyncServiceTest, GetSettingsAndDevices) {
-  base::CommandLine::ForCurrentProcess()->AppendSwitch(
-        switches::kEnableBraveSync);
   // The test absorbs OnSetupSyncNewToSync test
   auto callback1 = base::BindRepeating(
       [](std::unique_ptr<brave_sync::Settings> settings,