From d251beba91f3b1744fa89029849bda2b3cc3880d Mon Sep 17 00:00:00 2001 From: Anthony Tseng Date: Tue, 28 May 2019 11:03:59 -0700 Subject: [PATCH] Remove manually disable field trail feature Make sure https://github.com/brave/brave-browser/pull/4551 and https://github.com/brave/brave-core/pull/2471 landed first --- app/brave_main_delegate.cc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc index a80d4ca5e4ea..2819ddd52e21 100644 --- a/app/brave_main_delegate.cc +++ b/app/brave_main_delegate.cc @@ -30,7 +30,6 @@ #include "components/omnibox/common/omnibox_features.h" #include "components/password_manager/core/common/password_manager_features.h" #include "components/translate/core/browser/translate_prefs.h" -#include "components/sync/driver/sync_driver_switches.h" #include "components/unified_consent/feature.h" #include "extensions/common/extension_features.h" #include "services/network/public/cpp/features.h" @@ -162,9 +161,6 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) { // Disabled features. const std::unordered_set disabled_features = { autofill::features::kAutofillServerCommunication.name, - // TODO(darkdh): remove this when USS bookmarks is mature - // 84919fdb99b162030a1113d5990667885b774064 - switches::kSyncUSSBookmarks.name, network::features::kNetworkService.name, unified_consent::kUnifiedConsent.name, #if !defined(CHROME_MULTIPLE_DLL_CHILD) && !BUILDFLAG(ENABLE_BRAVE_TRANSLATE)