Separate sync and invalidation client IDs

chrome/browser/sync/invalidations/invalidator_storage.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.
 //
 // Wraps PrefService in an InvalidationStateTracker to allow SyncNotifiers
 // to use PrefService as persistence for invalidation state. It is not thread
 // safe, and lives on the UI thread.
 
 #ifndef CHROME_BROWSER_SYNC_INVALIDATIONS_INVALIDATOR_STORAGE_H_
 #define CHROME_BROWSER_SYNC_INVALIDATIONS_INVALIDATOR_STORAGE_H_
@@ skipping 19 matching lines @@
 // services.  For now this is still tied to sync while we refactor, so minimize
 // churn and keep it here.
 class InvalidatorStorage : public base::SupportsWeakPtr<InvalidatorStorage>,
                            public syncer::InvalidationStateTracker {
  public:
   // |pref_service| may be NULL (for unit tests), but in that case no setter
   // methods should be called. Does not own |pref_service|.
   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;
   virtual void SetMaxVersionAndPayload(const invalidation::ObjectId& id,
                                        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,
       base::Callback<void(const syncer::AckHandleMap&)> callback) OVERRIDE;
   virtual void Acknowledge(const invalidation::ObjectId& id,
                            const syncer::AckHandle& ack_handle) OVERRIDE;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(InvalidatorStorageTest, SerializeEmptyMap);
   FRIEND_TEST_ALL_PREFIXES(InvalidatorStorageTest,
@@ skipping 32 matching lines @@
 
   // May be NULL.
   PrefServiceSyncable* const pref_service_;
 
   DISALLOW_COPY_AND_ASSIGN(InvalidatorStorage);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_INVALIDATIONS_INVALIDATOR_STORAGE_H_