Skip to content

Commit

Permalink
Merge pull request #3681 from brave/fix_6435_sync_disable_uss
Browse files Browse the repository at this point in the history
Disable Sync USS Bookmarks
  • Loading branch information
AlexeyBarabash authored and mkarolin committed Oct 14, 2019
1 parent 6f3fb01 commit f809789
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions app/brave_main_delegate.cc
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {
features::kNotificationTriggers.name,
features::kSmsReceiver.name,
unified_consent::kUnifiedConsent.name,
switches::kSyncUSSBookmarks.name,
};
command_line.AppendFeatures(enabled_features, disabled_features);

Expand Down
2 changes: 2 additions & 0 deletions app/brave_main_delegate_browsertest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "components/autofill/core/common/autofill_features.h"
#include "components/autofill/core/common/autofill_payments_features.h"
#include "components/omnibox/common/omnibox_features.h"
#include "components/sync/driver/sync_driver_switches.h"
#include "components/unified_consent/feature.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/common/content_features.h"
Expand Down Expand Up @@ -49,6 +50,7 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
&features::kSmsReceiver,
&unified_consent::kUnifiedConsent,
&features::kLookalikeUrlNavigationSuggestionsUI,
&switches::kSyncUSSBookmarks,
};

for (const auto* feature : disabled_features)
Expand Down

0 comments on commit f809789

Please sign in to comment.