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

sync/engine/all_status.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 "sync/engine/all_status.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/port.h"
@@ skipping 149 matching lines @@
 void AllStatus::SetHasKeystoreKey(bool has_keystore_key) {
   ScopedStatusLock lock(this);
   status_.has_keystore_key = has_keystore_key;
 }
 
 void AllStatus::SetKeystoreMigrationTime(const base::Time& migration_time) {
   ScopedStatusLock lock(this);
   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) {
   ScopedStatusLock lock(this);
   switch(source) {
     case NUDGE_SOURCE_LOCAL_REFRESH:
       status_.nudge_source_local_refresh++;
       return;
     case NUDGE_SOURCE_LOCAL:
       status_.nudge_source_local++;
@@ skipping 12 matching lines @@
 ScopedStatusLock::ScopedStatusLock(AllStatus* allstatus)
     : allstatus_(allstatus) {
   allstatus->mutex_.Acquire();
 }
 
 ScopedStatusLock::~ScopedStatusLock() {
   allstatus_->mutex_.Release();
 }
 
 }  // namespace syncer