[Sync] Add support for remotely enabling keystore encryption

We hook up logic to the keystore_encryption experiment to enable the
keystore encryption logic. Once the experiment is received, on the next
client restart sync will start using the keystore encryption logic.

BUG=129665


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

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

1 files changed, 10 insertions, 2 deletions

diff --git a/sync/internal_api/public/util/experiments.h b/sync/internal_api/public/util/experiments.h
index 7cea6d6..b5730ce 100644
--- a/sync/internal_api/public/util/experiments.h
+++ b/sync/internal_api/public/util/experiments.h
@@ -9,17 +9,25 @@
 
 namespace syncer {
 
+const char kKeystoreEncryptionTag[] = "keystore_encryption";
+const char kKeystoreEncryptionFlag[] = "sync-keystore-encryption";
+
 // A structure to hold the enable status of experimental sync features.
 struct Experiments {
-  Experiments() : sync_tab_favicons(false) {}
+  Experiments() : sync_tab_favicons(false),
+                  keystore_encryption(false) {}
 
   bool Matches(const Experiments& rhs) {
-    return (sync_tab_favicons == rhs.sync_tab_favicons);
+    return (sync_tab_favicons == rhs.sync_tab_favicons &&
+            keystore_encryption == rhs.keystore_encryption);
   }
 
   // Enable syncing of favicons within tab sync (only has an effect if tab sync
   // is already enabled). This takes effect on the next restart.
   bool sync_tab_favicons;
+
+  // Enable keystore encryption logic and the new encryption UI.
+  bool keystore_encryption;
 };
 
 }  // namespace syncer