[Sync] Persist keystore key across restarts

sync/util/cryptographer_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/util/cryptographer.h"
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
@@ skipping 131 matching lines @@
   sync_pb::EncryptedData encrypted3;
   EXPECT_TRUE(cryptographer_.Encrypt(original, &encrypted3));
   sync_pb::EncryptedData encrypted4;
   EXPECT_TRUE(cryptographer_.Encrypt(original, &encrypted4));
 
   EXPECT_EQ(encrypted1.key_name(), encrypted2.key_name());
   EXPECT_NE(encrypted1.key_name(), encrypted3.key_name());
   EXPECT_EQ(encrypted3.key_name(), encrypted4.key_name());
 }
 
+// Ensure setting the keystore key works and doesn't modify the default nigori.
+TEST_F(SyncCryptographerTest, SetKeystore) {
+  EXPECT_FALSE(cryptographer_.is_initialized());
+  EXPECT_FALSE(cryptographer_.HasKeystoreKey());
+
+  EXPECT_FALSE(cryptographer_.SetKeystoreKey(""));
+  EXPECT_FALSE(cryptographer_.HasKeystoreKey());
+
+  EXPECT_TRUE(cryptographer_.SetKeystoreKey("keystore_key"));
+  EXPECT_TRUE(cryptographer_.HasKeystoreKey());
+  EXPECT_FALSE(cryptographer_.is_initialized());
+}
+
 // Crashes, Bug 55178.
 #if defined(OS_WIN)
 #define MAYBE_EncryptExportDecrypt DISABLED_EncryptExportDecrypt
 #else
 #define MAYBE_EncryptExportDecrypt EncryptExportDecrypt
 #endif
 TEST_F(SyncCryptographerTest, MAYBE_EncryptExportDecrypt) {
   sync_pb::EncryptedData nigori;
   sync_pb::EncryptedData encrypted;
 
@@ skipping 53 matching lines @@
   EXPECT_NE(static_cast<Nigori*>(NULL), unpacked.get());
 
   std::string user_key, encryption_key, mac_key;
   ASSERT_TRUE(unpacked->ExportKeys(&user_key, &encryption_key, &mac_key));
 
   EXPECT_EQ(expected_user, user_key);
   EXPECT_EQ(expected_encryption, encryption_key);
   EXPECT_EQ(expected_mac, mac_key);
 }
 
+// Test that bootstrapping the keystore key works and doesn't affect the default
+// nigori.
+TEST_F(SyncCryptographerTest, BootstrapKeystore) {
+  std::string token;
+  cryptographer_.GetKeystoreKeyBootstrapToken(&token);
+  EXPECT_TRUE(token.empty());
+
+  cryptographer_.SetKeystoreKey("keystore_key");
+  cryptographer_.GetKeystoreKeyBootstrapToken(&token);
+  EXPECT_FALSE(token.empty());
+
+  Cryptographer cryptographer2(&encryptor_);
+  EXPECT_FALSE(cryptographer2.HasKeystoreKey());
+  cryptographer2.BootstrapKeystoreKey(token);
+  EXPECT_TRUE(cryptographer2.HasKeystoreKey());
+  EXPECT_FALSE(cryptographer2.is_initialized());
+}
+
 TEST_F(SyncCryptographerTest, NigoriEncryptionTypes) {
   Cryptographer cryptographer2(&encryptor_);
   sync_pb::NigoriSpecifics nigori;
 
   StrictMock<MockObserver> observer;
   cryptographer_.AddObserver(&observer);
   StrictMock<MockObserver> observer2;
   cryptographer2.AddObserver(&observer2);
 
   // Just set the sensitive types (shouldn't trigger any
@@ skipping 147 matching lines @@
         iter.Get() == syncable::BOOKMARKS)
       EXPECT_TRUE(encrypted_types.Has(iter.Get()));
     else
       EXPECT_FALSE(encrypted_types.Has(iter.Get()));
   }
 
   cryptographer_.RemoveObserver(&observer);
 }
 
 }  // namespace browser_sync