Separate sync and invalidation client IDs

sync/engine/all_status.cc

Index: sync/engine/all_status.cc
diff --git a/sync/engine/all_status.cc b/sync/engine/all_status.cc
index 24ab03a839e7088a5b15875e532f51b681efb70f..a502b343552d9e9dc5b958b52faf8dc53ad794ba 100644
--- a/sync/engine/all_status.cc
+++ b/sync/engine/all_status.cc
@@ -164,9 +164,15 @@ void AllStatus::SetKeystoreMigrationTime(const base::Time& migration_time) {
   status_.keystore_migration_time = migration_time;
 }
 
-void AllStatus::SetUniqueId(const std::string& guid) {
+void AllStatus::SetSyncId(const std::string& sync_id) {
   ScopedStatusLock lock(this);
-  status_.unique_id = guid;
+  status_.sync_id = sync_id;
+}
+
+void AllStatus::SetInvalidatorClientId(
+    const std::string& invalidator_client_id) {
+  ScopedStatusLock lock(this);
+  status_.invalidator_client_id = invalidator_client_id;
 }
 
 void AllStatus::IncrementNudgeCounter(NudgeSource source) {