[Sync] Cleanup unused experiment logic

Types are all enabled by default already, so the experiments logic was
unnecessary.

BUG=none
TBR=bauerb@chromium.org

Review URL: https://chromiumcodereview.appspot.com/18854004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211191 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 2 insertions, 25 deletions

diff --git a/sync/internal_api/public/util/experiments.h b/sync/internal_api/public/util/experiments.h
index 673588d..6c53e30 100644
--- a/sync/internal_api/public/util/experiments.h
+++ b/sync/internal_api/public/util/experiments.h
@@ -9,34 +9,22 @@
 
 namespace syncer {
 
-const char kKeystoreEncryptionTag[] = "keystore_encryption";
 const char kAutofillCullingTag[] = "autofill_culling";
 const char kFaviconSyncTag[] = "favicon_sync";
-const char kFaviconSyncFlag[] = "enable-sync-favicons";
 
 // A structure to hold the enable status of experimental sync features.
 struct Experiments {
-  Experiments() : keystore_encryption(false),
-                  autofill_culling(false),
-                  favicon_sync(false),
+  Experiments() : autofill_culling(false),
                   favicon_sync_limit(200) {}
 
   bool Matches(const Experiments& rhs) {
-    return (keystore_encryption == rhs.keystore_encryption &&
-            autofill_culling == rhs.autofill_culling &&
-            favicon_sync == rhs.favicon_sync &&
+    return (autofill_culling == rhs.autofill_culling &&
             favicon_sync_limit == rhs.favicon_sync_limit);
   }
 
-  // Enable keystore encryption logic and the new encryption UI.
-  bool keystore_encryption;
-
   // Enable deletion of expired autofill entries (if autofill sync is enabled).
   bool autofill_culling;
 
-  // Enable the favicons sync datatypes (favicon images and favicon tracking).
-  bool favicon_sync;
-
   // The number of favicons that a client is permitted to sync.
   int favicon_sync_limit;
 };
diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc
index 5700fb9..0825317 100644
--- a/sync/internal_api/sync_manager_impl.cc
+++ b/sync/internal_api/sync_manager_impl.cc
@@ -1275,15 +1275,6 @@ bool SyncManagerImpl::ReceivedExperiment(Experiments* experiments) {
   }
   bool found_experiment = false;
 
-  ReadNode keystore_node(&trans);
-  if (keystore_node.InitByClientTagLookup(
-          syncer::EXPERIMENTS,
-          syncer::kKeystoreEncryptionTag) == BaseNode::INIT_OK &&
-      keystore_node.GetExperimentsSpecifics().keystore_encryption().enabled()) {
-    experiments->keystore_encryption = true;
-    found_experiment = true;
-  }
-
   ReadNode autofill_culling_node(&trans);
   if (autofill_culling_node.InitByClientTagLookup(
           syncer::EXPERIMENTS,
@@ -1298,8 +1289,6 @@ bool SyncManagerImpl::ReceivedExperiment(Experiments* experiments) {
   if (favicon_sync_node.InitByClientTagLookup(
           syncer::EXPERIMENTS,
           syncer::kFaviconSyncTag) == BaseNode::INIT_OK) {
-    experiments->favicon_sync = favicon_sync_node.GetExperimentsSpecifics().
-        favicon_sync().enabled();
     experiments->favicon_sync_limit =
         favicon_sync_node.GetExperimentsSpecifics().favicon_sync().
             favicon_sync_limit();