[Sync] Add keystore encryption info to about:sync

chrome/browser/sync/about_sync_util.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 "chrome/browser/sync/about_sync_util.h"
 
 #include <string>
 
 #include "base/string16.h"
 #include "base/values.h"
@@ skipping 175 matching lines @@
   ListValue* section_encryption = AddSection(stats_list, "Encryption");
   BoolSyncStat is_using_explicit_passphrase(section_encryption,
                                             "Explicit Passphrase");
   BoolSyncStat is_passphrase_required(section_encryption,
                                       "Passphrase Required");
   BoolSyncStat is_cryptographer_ready(section_encryption,
                                       "Cryptographer Ready");
   BoolSyncStat has_pending_keys(section_encryption,
                                 "Cryptographer Has Pending Keys");
   StringSyncStat encrypted_types(section_encryption, "Encrypted Types");
+  BoolSyncStat has_keystore_key(section_encryption, "Has Keystore Key");
+  StringSyncStat keystore_migration_time(section_encryption,
+                                         "Keystore Migration Time");
+  StringSyncStat passphrase_type(section_encryption,
+                                 "Passphrase Type");
 
   ListValue* section_last_session = AddSection(
       stats_list, "Status from Last Completed Session");
   StringSyncStat session_source(section_last_session, "Sync Source");
   StringSyncStat get_key_result(section_last_session, "GetKey Step Result");
   StringSyncStat download_result(section_last_session, "Download Step Result");
   StringSyncStat commit_result(section_last_session, "Commit Step Result");
 
   ListValue* section_counters = AddSection(stats_list, "Running Totals");
   IntSyncStat notifications_received(section_counters,
@@ skipping 80 matching lines @@
   if (sync_initialized) {
     is_using_explicit_passphrase.SetValue(
         service->IsUsingSecondaryPassphrase());
     is_passphrase_required.SetValue(service->IsPassphraseRequired());
   }
   if (is_status_valid) {
     is_cryptographer_ready.SetValue(full_status.cryptographer_ready);
     has_pending_keys.SetValue(full_status.crypto_has_pending_keys);
     encrypted_types.SetValue(
         ModelTypeSetToString(full_status.encrypted_types));
+    has_keystore_key.SetValue(full_status.has_keystore_key);
+    keystore_migration_time.SetValue(full_status.keystore_migration_time);

[akalin, 2012/09/17 18:07:20]

yeah, I think the string convs should happen here

[Nicolas Zea, 2012/09/17 21:00:24]

Done.

+    passphrase_type.SetValue(full_status.passphrase_type);
   }
 
   if (snapshot.is_initialized()) {
     session_source.SetValue(
         syncer::GetUpdatesSourceString(snapshot.source().updates_source));
     get_key_result.SetValue(
         GetSyncerErrorString(
             snapshot.model_neutral_state().last_get_key_result));
     download_result.SetValue(
         GetSyncerErrorString(
@@ skipping 86 matching lines @@
     about_info->SetString("unrecoverable_error_message",
                        unrecoverable_error_message);
   }
 
   about_info->Set("type_status", service->GetTypeStatusMap());
 
   return about_info.Pass();
 }
 
 }  // namespace sync_ui_util