Remove enhanced bookmarks sync experiment

chrome/browser/bookmarks/enhanced_bookmarks_features.h

Index: chrome/browser/bookmarks/enhanced_bookmarks_features.h
diff --git a/chrome/browser/bookmarks/enhanced_bookmarks_features.h b/chrome/browser/bookmarks/enhanced_bookmarks_features.h
index 7faf6bc56ef1f2034d2d9f5ae6301bd910de839b..8e6a98701678473f7693b6ca247dbb33a3f2220c 100644
--- a/chrome/browser/bookmarks/enhanced_bookmarks_features.h
+++ b/chrome/browser/bookmarks/enhanced_bookmarks_features.h
@@ -9,57 +9,11 @@
 
 #include "build/build_config.h"
 
-namespace about_flags {
-class FlagsStorage;
-}  // namespace about_flags
-
 class PrefService;
-class Profile;
-
-// States for bookmark experiment. They are set by Chrome sync into
-// sync_driver::prefs::kEnhancedBookmarksExperimentEnabled user preference and
-// used for UMA reporting as well.
-enum BookmarksExperimentState {
-  BOOKMARKS_EXPERIMENT_NONE,
-  BOOKMARKS_EXPERIMENT_ENABLED,
-  BOOKMARKS_EXPERIMENT_ENABLED_USER_OPT_OUT,
-  BOOKMARKS_EXPERIMENT_ENABLED_FROM_FINCH,
-  BOOKMARKS_EXPERIMENT_OPT_OUT_FROM_FINCH,
-  BOOKMARKS_EXPERIMENT_ENABLED_FROM_FINCH_USER_SIGNEDIN,
-  BOOKMARKS_EXPERIMENT_ENABLED_FROM_SYNC_UNKNOWN,
-  BOOKMARKS_EXPERIMENT_ENUM_SIZE
-};
-
-// Returns true and sets |extension_id| if bookmarks experiment enabled
-//         false if no bookmark experiment or extension id is empty.
-bool GetBookmarksExperimentExtensionID(const PrefService* user_prefs,
-                                       std::string* extension_id);
-
-// Updates bookmark experiment state based on information from Chrome sync,
-// Finch experiments, and command line flag.
-void UpdateBookmarksExperimentState(
-    PrefService* user_prefs,
-    PrefService* local_state,
-    bool user_signed_in,
-    BookmarksExperimentState experiment_enabled_from_sync);
-
-// Same as UpdateBookmarksExperimentState, but the last argument with
-// BOOKMARKS_EXPERIMENT_ENABLED_FROM_SYNC_UNKNOWN.
-// Intended for performing initial configuration of bookmarks experiments
-// when the browser is first initialized.
-void InitBookmarksExperimentState(Profile* profile);
-
-// Sets flag to opt-in user into Finch experiment.
-void ForceFinchBookmarkExperimentIfNeeded(
-    PrefService* local_state,
-    BookmarksExperimentState bookmarks_experiment_state);
 
-// Returns true if enhanced bookmarks experiment is running.
-// Experiment could run by Chrome sync or by Finch.
-// Note that this doesn't necessarily mean that enhanced bookmarks
-// is enabled, e.g., user can opt out using a flag.
-bool IsEnhancedBookmarksExperimentEnabled(
-    about_flags::FlagsStorage* flags_storage);
+// Returns true and sets |extension_id| if enhanced bookmarks experiment is
+// enabled. Returns false if no bookmark experiment or extension id is empty.
+bool GetBookmarksExperimentExtensionID(std::string* extension_id);
 
 #if defined(OS_ANDROID)
 // Returns true if enhanced bookmark salient image prefetching is enabled.
@@ -67,7 +21,7 @@ bool IsEnhancedBookmarksExperimentEnabled(
 bool IsEnhancedBookmarkImageFetchingEnabled(const PrefService* user_prefs);
 
 // Returns true if enhanced bookmarks is enabled.
-bool IsEnhancedBookmarksEnabled(const PrefService* user_prefs);
+bool IsEnhancedBookmarksEnabled();
 
 #endif