Separate sync and invalidation client IDs

sync/engine/all_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.
 //
 // The AllStatus object watches various sync engine components and aggregates
 // the status of all of them into one place.
 
 #ifndef SYNC_INTERNAL_API_ALL_STATUS_H_
 #define SYNC_INTERNAL_API_ALL_STATUS_H_
 
@@ skipping 40 matching lines @@
 
   void SetThrottledTypes(ModelTypeSet types);
 
   void SetEncryptedTypes(ModelTypeSet types);
   void SetCryptographerReady(bool ready);
   void SetCryptoHasPendingKeys(bool has_pending_keys);
   void SetPassphraseType(PassphraseType type);
   void SetHasKeystoreKey(bool has_keystore_key);
   void SetKeystoreMigrationTime(const base::Time& migration_time);
 
-  void SetUniqueId(const std::string& guid);
+  void SetSyncId(const std::string& guid);
+  void SetInvalidatorClientId(const std::string& invalidator_client_id);
 
   void IncrementNudgeCounter(NudgeSource source);
 
  protected:
   // Examines syncer to calculate syncing and the unsynced count,
   // and returns a Status with new values.
   SyncStatus CalcSyncing(const SyncEngineEvent& event) const;
   SyncStatus CreateBlankStatus() const;
 
   SyncStatus status_;
 
   mutable base::Lock mutex_;  // Protects all data members.
   DISALLOW_COPY_AND_ASSIGN(AllStatus);
 };
 
 class ScopedStatusLock {
  public:
   explicit ScopedStatusLock(AllStatus* allstatus);
   ~ScopedStatusLock();
  protected:
   AllStatus* allstatus_;
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_INTERNAL_API_ALL_STATUS_H_