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

sync/internal_api/public/engine/sync_status.h

 // 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.
 
 #ifndef SYNC_INTERNAL_API_PUBLIC_ENGINE_STATUS_SUMMARY_H_
 #define SYNC_INTERNAL_API_PUBLIC_ENGINE_STATUS_SUMMARY_H_
 
 #include <string>
 
 #include "base/time.h"
@@ skipping 75 matching lines @@
   ModelTypeSet encrypted_types;
   bool cryptographer_ready;
   bool crypto_has_pending_keys;
   bool has_keystore_key;
   base::Time keystore_migration_time;
   PassphraseType passphrase_type;
 
   // Per-datatype throttled status.
   ModelTypeSet throttled_types;
 
-  // The unique identifer for this client.
-  std::string unique_id;
+  // The unique identifer for the sync store.
+  std::string sync_id;
+
+  // The unique identifier for the invalidation client.
+  std::string invalidator_client_id;
 
   // Counters grouped by model type
   std::vector<int> num_entries_by_type;
   std::vector<int> num_to_delete_entries_by_type;
 
   // Time of next retry if sync scheduler is throttled or in backoff.
   base::Time retry_time;
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_INTERNAL_API_PUBLIC_ENGINE_STATUS_SUMMARY_H_