Separate sync and invalidation client IDs

sync/notifier/invalidation_state_tracker.h

Index: sync/notifier/invalidation_state_tracker.h
diff --git a/sync/notifier/invalidation_state_tracker.h b/sync/notifier/invalidation_state_tracker.h
index 957b9c4d0b5e55bac30255611acb39e1b73d212e..cb912341294cf2c730887c2bfb70aa723f1f4361 100644
--- a/sync/notifier/invalidation_state_tracker.h
+++ b/sync/notifier/invalidation_state_tracker.h
@@ -62,6 +62,12 @@ class InvalidationStateTracker {
   // Removes all state tracked for |ids|.
   virtual void Forget(const ObjectIdSet& ids) = 0;
 
+  // The per-client unique ID used to register the invalidation client with the
+  // server.  This is used to 'squelch' invalidation notifications that
+  // originate from changes made by this client.
+  virtual void SetInvalidatorClientId(const std::string& data) = 0;
+  virtual std::string GetInvalidatorClientId() const = 0;
+
   // Used by invalidation::InvalidationClient for persistence. |data| is an
   // opaque blob that an invalidation client can use after a restart to
   // bootstrap itself. |data| is binary data (not valid UTF8, embedded nulls,
@@ -69,6 +75,9 @@ class InvalidationStateTracker {
   virtual void SetBootstrapData(const std::string& data) = 0;
   virtual std::string GetBootstrapData() const = 0;
 
+  // Erases invalidation versions, client ID, and state stored on disk.
+  virtual void Clear() = 0;
+
   // Used for generating our own local ack handles. Generates a new ack handle
   // for each object id in |ids|. The result is returned via |callback| posted
   // to |task_runner|.