Merge pull request #3681 from brave/fix_6435_sync_disable_uss

Disable Sync USS Bookmarks
brave · Oct 15, 2019 · 1f38317 · 1f38317
1 parent f5d4b74
commit 1f38317
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc
@@ -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);
 

diff --git a/app/brave_main_delegate_browsertest.cc b/app/brave_main_delegate_browsertest.cc
@@ -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"
@@ -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)