diff --git a/common/brave_switches.cc b/common/brave_switches.cc index c2e85e8152df..596928eb9cf5 100644 --- 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 index ec0fda8e0cbb..7ed1103c8906 100644 --- 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 index e4e682e295d5..4612a7491c30 100644 --- 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 index b23d68e02cb5..778e9da64039 100644 --- 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 settings,