[Sync] Move keystore key handling to SyncEncryptionHandlerImpl

sync/internal_api/js_sync_encryption_handler_observer_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/internal_api/js_sync_encryption_handler_observer.h"
 
 #include "base/basictypes.h"
 #include "base/location.h"
 #include "base/message_loop.h"
 #include "base/values.h"
@@ skipping 75 matching lines @@
   js_sync_encryption_handler_observer_.OnPassphraseRequired(
       REASON_PASSPHRASE_NOT_REQUIRED,
       sync_pb::EncryptedData());
   js_sync_encryption_handler_observer_.OnPassphraseRequired(REASON_ENCRYPTION,
                                                  sync_pb::EncryptedData());
   js_sync_encryption_handler_observer_.OnPassphraseRequired(REASON_DECRYPTION,
                                                  sync_pb::EncryptedData());
   PumpLoop();
 }
 
-TEST_F(JsSyncEncryptionHandlerObserverTest, SensitiveNotifiations) {
-  DictionaryValue redacted_token_details;
-  redacted_token_details.SetString("token", "<redacted>");
-  DictionaryValue redacted_bootstrap_token_details;
-  redacted_bootstrap_token_details.SetString("bootstrapToken", "<redacted>");
+TEST_F(JsSyncEncryptionHandlerObserverTest, OnBootstrapTokenUpdated) {
+  DictionaryValue bootstrap_token_details;
+  bootstrap_token_details.SetString("bootstrapToken", "<redacted>");
+  bootstrap_token_details.SetString("type", "PASSPHRASE_BOOTSTRAP_TOKEN");
 
   EXPECT_CALL(mock_js_event_handler_,
               HandleJsEvent(
-                  "OnBootstrapTokenUpdated",
-                  HasDetailsAsDictionary(redacted_bootstrap_token_details)));
+                  "onBootstrapTokenUpdated",
+                  HasDetailsAsDictionary(bootstrap_token_details)));
 
   js_sync_encryption_handler_observer_.OnBootstrapTokenUpdated(
-      "sensitive_token");
+      "sensitive_token", PASSPHRASE_BOOTSTRAP_TOKEN);
   PumpLoop();
 }
 
 TEST_F(JsSyncEncryptionHandlerObserverTest, OnEncryptedTypesChanged) {
   DictionaryValue expected_details;
   ListValue* encrypted_type_values = new ListValue();
   const bool encrypt_everything = false;
   expected_details.Set("encryptedTypes", encrypted_type_values);
   expected_details.SetBoolean("encryptEverything", encrypt_everything);
   ModelTypeSet encrypted_types;
@@ skipping 44 matching lines @@
               HandleJsEvent("onPassphraseStateChanged",
                             HasDetailsAsDictionary(passphrase_state_details)));
 
   js_sync_encryption_handler_observer_.OnPassphraseStateChanged(
       IMPLICIT_PASSPHRASE);
   PumpLoop();
 }
 
 }  // namespace
 }  // namespace syncer