[Sync] Move keystore key handling to SyncEncryptionHandlerImpl

sync/internal_api/js_sync_encryption_handler_observer.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 <cstddef>
 
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 31 matching lines @@
 
 void JsSyncEncryptionHandlerObserver::OnPassphraseAccepted() {
   if (!event_handler_.IsInitialized()) {
     return;
   }
   DictionaryValue details;
   HandleJsEvent(FROM_HERE, "onPassphraseAccepted", JsEventDetails(&details));
 }
 
 void JsSyncEncryptionHandlerObserver::OnBootstrapTokenUpdated(
-    const std::string& boostrap_token) {
+    const std::string& boostrap_token,
+    BootstrapTokenType type) {
   if (!event_handler_.IsInitialized()) {
     return;
   }
   DictionaryValue details;
-  details.SetString("bootstrapToken", "<redacted>");

[akalin, 2012/08/22 22:09:33]

clearer to keep the redacted bootstrapToken key and change bootstrapTokenUpdated
to "type"

[Nicolas Zea, 2012/08/22 22:48:59]

Done.

+  details.SetString("bootstrapTokenUpdated",
+                    BootstrapTokenTypeToString(type));
   HandleJsEvent(FROM_HERE, "OnBootstrapTokenUpdated", JsEventDetails(&details));
 }
 
 void JsSyncEncryptionHandlerObserver::OnEncryptedTypesChanged(
     ModelTypeSet encrypted_types,
     bool encrypt_everything) {
   if (!event_handler_.IsInitialized()) {
     return;
   }
   DictionaryValue details;
@@ skipping 45 matching lines @@
     const std::string& name, const JsEventDetails& details) {
   if (!event_handler_.IsInitialized()) {
     NOTREACHED();
     return;
   }
   event_handler_.Call(from_here,
                       &JsEventHandler::HandleJsEvent, name, details);
 }
 
 }  // namespace syncer