Separate sync and invalidation client IDs

sync/notifier/non_blocking_invalidator.h

Index: sync/notifier/non_blocking_invalidator.h
diff --git a/sync/notifier/non_blocking_invalidator.h b/sync/notifier/non_blocking_invalidator.h
index a35b42a830adf19808b7f4772e32ca33c6c4bedb..5df6872c0850e4d38e4689433c1204eefd949776 100644
--- a/sync/notifier/non_blocking_invalidator.h
+++ b/sync/notifier/non_blocking_invalidator.h
@@ -38,6 +38,7 @@ class SYNC_EXPORT_PRIVATE NonBlockingInvalidator
   // |invalidation_state_tracker| must be initialized.
   NonBlockingInvalidator(
       const notifier::NotifierOptions& notifier_options,
+      const std::string& invalidator_client_id,
       const InvalidationStateMap& initial_invalidation_state_map,
       const std::string& invalidation_bootstrap_data,
       const WeakHandle<InvalidationStateTracker>&
@@ -52,7 +53,6 @@ class SYNC_EXPORT_PRIVATE NonBlockingInvalidator
                                    const ObjectIdSet& ids) OVERRIDE;
   virtual void UnregisterHandler(InvalidationHandler* handler) OVERRIDE;
   virtual InvalidatorState GetInvalidatorState() const OVERRIDE;
-  virtual void SetUniqueId(const std::string& unique_id) OVERRIDE;
   virtual void UpdateCredentials(
       const std::string& email, const std::string& token) OVERRIDE;
   virtual void SendInvalidation(
@@ -77,6 +77,9 @@ class SYNC_EXPORT_PRIVATE NonBlockingInvalidator
   scoped_refptr<base::SingleThreadTaskRunner> parent_task_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
 
+  // A copy of the owned invalidator's client ID.
+  const std::string invalidator_client_id_;
+
   DISALLOW_COPY_AND_ASSIGN(NonBlockingInvalidator);
 };