Separate sync and invalidation client IDs

chrome/browser/sync/invalidations/invalidator_storage.h

Index: chrome/browser/sync/invalidations/invalidator_storage.h
diff --git a/chrome/browser/sync/invalidations/invalidator_storage.h b/chrome/browser/sync/invalidations/invalidator_storage.h
index 12e67ae89f9f9ca3094c20ae38f8f1f817474678..eb0e3bc555e4799236272cc191b917e52a7fb57f 100644
--- a/chrome/browser/sync/invalidations/invalidator_storage.h
+++ b/chrome/browser/sync/invalidations/invalidator_storage.h
@@ -37,9 +37,6 @@ class InvalidatorStorage : public base::SupportsWeakPtr<InvalidatorStorage>,
   explicit InvalidatorStorage(PrefServiceSyncable* pref_service);
   virtual ~InvalidatorStorage();
 
-  // Erases invalidation versions and state stored on disk.
-  void Clear();
-
   // InvalidationStateTracker implementation.
   virtual syncer::InvalidationStateMap GetAllInvalidationStates() const
       OVERRIDE;
@@ -47,8 +44,11 @@ class InvalidatorStorage : public base::SupportsWeakPtr<InvalidatorStorage>,
                                        int64 max_version,
                                        const std::string& payload) OVERRIDE;
   virtual void Forget(const syncer::ObjectIdSet& ids) OVERRIDE;
+  virtual void SetInvalidatorClientId(const std::string& client_id) OVERRIDE;
+  virtual std::string GetInvalidatorClientId() const OVERRIDE;
   virtual void SetBootstrapData(const std::string& data) OVERRIDE;
   virtual std::string GetBootstrapData() const OVERRIDE;
+  virtual void Clear() OVERRIDE;
   virtual void GenerateAckHandles(
       const syncer::ObjectIdSet& ids,
       const scoped_refptr<base::TaskRunner>& task_runner,