Separate invalidator and sync client ID (part 1/2)

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 161 matching lines @@
   // a class is instantiated, which allows us to reference the fields in
   // 'setter' code later on in this function.
   ListValue* section_summary = AddSection(stats_list, "Summary");
   StringSyncStat summary_string(section_summary, "Summary");
 
   ListValue* section_version = AddSection(stats_list, "Version Info");
   StringSyncStat client_version(section_version, "Client Version");
   StringSyncStat server_url(section_version, "Server URL");
 
   ListValue* section_credentials = AddSection(stats_list, kCredentialsTitle);
-  StringSyncStat client_id(section_credentials, "Client ID");
+  StringSyncStat sync_id(section_credentials, "Sync Client ID");
+  StringSyncStat invalidator_id(section_credentials, "Invalidator Client ID");
   StringSyncStat username(section_credentials, "Username");
   BoolSyncStat is_token_available(section_credentials, "Sync Token Available");
 
   ListValue* section_local = AddSection(stats_list, "Local State");
   StringSyncStat last_synced(section_local, "Last Synced");
   BoolSyncStat is_setup_complete(section_local,
                                  "Sync First-Time Setup Complete");
   BoolSyncStat is_backend_initialized(section_local,
                                       "Sync Backend Initialized");
   BoolSyncStat is_syncing(section_local, "Syncing");
@@ skipping 89 matching lines @@
   const syncer::sessions::SyncSessionSnapshot& snapshot =
       sync_initialized ?
       service->GetLastSessionSnapshot() :
       syncer::sessions::SyncSessionSnapshot();
 
   if (is_status_valid)
     summary_string.SetValue(service->QuerySyncStatusSummary());
 
   server_url.SetValue(service->sync_service_url().spec());
 
-  if (is_status_valid && !full_status.unique_id.empty())
-    client_id.SetValue(full_status.unique_id);
+  if (is_status_valid && !full_status.sync_id.empty())
+    sync_id.SetValue(full_status.sync_id);
+  if (is_status_valid && !full_status.invalidator_client_id.empty())
+    invalidator_id.SetValue(full_status.invalidator_client_id);
   if (service->signin())
     username.SetValue(service->signin()->GetAuthenticatedUsername());
   is_token_available.SetValue(service->IsSyncTokenAvailable());
 
   last_synced.SetValue(service->GetLastSyncedTimeString());
   is_setup_complete.SetValue(service->HasSyncSetupCompleted());
   is_backend_initialized.SetValue(sync_initialized);
   if (is_status_valid) {
     is_syncing.SetValue(full_status.syncing);
     retry_time.SetValue(GetTimeStr(full_status.retry_time,
@@ skipping 128 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