From 9c132c5d142b38d7f2aa3b3c063d537faafdae65 Mon Sep 17 00:00:00 2001 From: AlexeyBarabash Date: Fri, 11 Oct 2019 19:20:18 +0300 Subject: [PATCH 1/2] Disable Sync USS Bookmarks Fixes brave-browser#6435 --- app/brave_main_delegate.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc index b09025ee0d37..132445788e1b 100644 --- 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); From 7a5ad9ae892a501df39d23193e27234f132c354f Mon Sep 17 00:00:00 2001 From: AlexeyBarabash Date: Fri, 11 Oct 2019 19:55:41 +0300 Subject: [PATCH 2/2] Updated test for disabled Sync USS Bookmarks --- app/brave_main_delegate_browsertest.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/brave_main_delegate_browsertest.cc b/app/brave_main_delegate_browsertest.cc index ce0dcb35f57b..cef85cae08a1 100644 --- 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)