Skip to content

Commit

Permalink
Set sync to default enabled and provide "disable-brave-sync" switch
Browse files Browse the repository at this point in the history
  • Loading branch information
darkdh committed Nov 21, 2018
1 parent 4807138 commit 5de2810
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 11 deletions.
5 changes: 2 additions & 3 deletions common/brave_switches.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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".
Expand Down
2 changes: 1 addition & 1 deletion common/brave_switches.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ extern const char kDisableTorClientUpdaterExtension[];

extern const char kDisableWebTorrentExtension[];

extern const char kEnableBraveSync[];
extern const char kDisableBraveSync[];

extern const char kRewardsEnv[];

Expand Down
6 changes: 3 additions & 3 deletions components/brave_sync/brave_sync_service.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 0 additions & 4 deletions components/brave_sync/brave_sync_service_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 5de2810

Please sign in to comment.