[Sync] Move keystore key handling to SyncEncryptionHandlerImpl

sync/internal_api/debug_info_event_listener.cc

Index: sync/internal_api/debug_info_event_listener.cc
diff --git a/sync/internal_api/debug_info_event_listener.cc b/sync/internal_api/debug_info_event_listener.cc
index f59a2fa4e8cab88897ad0a15415c892fc9cfe02d..9ca49735e83dba24c95b2ff8be028c79b9db2d78 100644
--- a/sync/internal_api/debug_info_event_listener.cc
+++ b/sync/internal_api/debug_info_event_listener.cc
@@ -68,8 +68,13 @@ void DebugInfoEventListener::OnPassphraseAccepted() {
 }
 
 void DebugInfoEventListener::OnBootstrapTokenUpdated(
-    const std::string& bootstrap_token) {
-  CreateAndAddEvent(sync_pb::DebugEventInfo::BOOTSTRAP_TOKEN_UPDATED);
+    const std::string& bootstrap_token, BootstrapTokenType type) {
+  if (type == PASSPHRASE_BOOTSTRAP_TOKEN) {
+    CreateAndAddEvent(sync_pb::DebugEventInfo::BOOTSTRAP_TOKEN_UPDATED);
+    return;
+  }
+  DCHECK_EQ(type, KEYSTORE_BOOTSTRAP_TOKEN);
+  CreateAndAddEvent(sync_pb::DebugEventInfo::KEYSTORE_TOKEN_UPDATED);
 }
 
 void DebugInfoEventListener::OnStopSyncingPermanently() {