Clean up dead code related to enhanced_bookmarks.

This deletes the last bit of components/enhanced_bookmarks (by moving
the enum into chrome/android/java, the only place where it's used),
and cleans up dead code related to enhanced bookmarks.

BUG=474719

Review URL: https://codereview.chromium.org/1664503002

Cr-Commit-Position: refs/heads/master@{#374210}

1 files changed, 0 insertions, 10 deletions

diff --git a/sync/internal_api/public/util/experiments.h b/sync/internal_api/public/util/experiments.h
index f105723..264702e 100644
--- a/sync/internal_api/public/util/experiments.h
+++ b/sync/internal_api/public/util/experiments.h
@@ -13,7 +13,6 @@ namespace syncer {
 
 const char kFaviconSyncTag[] = "favicon_sync";
 const char kPreCommitUpdateAvoidanceTag[] = "pre_commit_update_avoidance";
-const char kEnhancedBookmarksTag[] = "enhanced_bookmarks";
 const char kGCMInvalidationsTag[] = "gcm_invalidations";
 const char kWalletSyncTag[] = "wallet_sync";
 
@@ -21,14 +20,11 @@ const char kWalletSyncTag[] = "wallet_sync";
 struct Experiments {
   Experiments()
       : favicon_sync_limit(200),
-        enhanced_bookmarks_enabled(false),
         gcm_invalidations_enabled(true),  // By default GCM channel is enabled.
         wallet_sync_enabled(false) {}
 
   bool Matches(const Experiments& rhs) {
     return (favicon_sync_limit == rhs.favicon_sync_limit &&
-            enhanced_bookmarks_enabled == rhs.enhanced_bookmarks_enabled &&
-            enhanced_bookmarks_ext_id == rhs.enhanced_bookmarks_ext_id &&
             gcm_invalidations_enabled == rhs.gcm_invalidations_enabled &&
             wallet_sync_enabled == rhs.wallet_sync_enabled);
   }
@@ -36,15 +32,9 @@ struct Experiments {
   // The number of favicons that a client is permitted to sync.
   int favicon_sync_limit;
 
-  // Enable the enhanced bookmarks sync datatype.
-  bool enhanced_bookmarks_enabled;
-
   // Enable invalidations over GCM channel.
   bool gcm_invalidations_enabled;
 
-  // Enhanced bookmarks extension id.
-  std::string enhanced_bookmarks_ext_id;
-
   // Enable the Wallet Autofill sync datatype.
   bool wallet_sync_enabled;
 };