Separate sync and invalidation client IDs

sync/notifier/p2p_invalidator.h

Index: sync/notifier/p2p_invalidator.h
diff --git a/sync/notifier/p2p_invalidator.h b/sync/notifier/p2p_invalidator.h
index d3faa66c5e8731d1b8cc190a77474d7891545d6a..8e577d1c62b93625bcfe3a5a2a71f50ce86d4f58 100644
--- a/sync/notifier/p2p_invalidator.h
+++ b/sync/notifier/p2p_invalidator.h
@@ -98,6 +98,7 @@ class SYNC_EXPORT_PRIVATE P2PInvalidator
   // to send notifications to all clients except for the one that triggered the
   // notification.  See crbug.com/97780.
   P2PInvalidator(scoped_ptr<notifier::PushClient> push_client,
+                 const std::string& invalidator_client_id,
                  P2PNotificationTarget send_notification_target);
 
   virtual ~P2PInvalidator();
@@ -108,7 +109,6 @@ class SYNC_EXPORT_PRIVATE P2PInvalidator
                                    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(
@@ -134,7 +134,7 @@ class SYNC_EXPORT_PRIVATE P2PInvalidator
   // The push client.
   scoped_ptr<notifier::PushClient> push_client_;
   // Our unique ID.
-  std::string unique_id_;
+  std::string invalidator_client_id_;
   // Whether we have called UpdateCredentials() yet.
   bool logged_in_;
   bool notifications_enabled_;