Separate sync and invalidation client IDs

sync/notifier/p2p_invalidator.h

 // Copyright 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.
 //
 // An invalidator that uses p2p invalidations based on XMPP push
 // notifications.  Used only for sync integration tests.
 
 #ifndef SYNC_NOTIFIER_P2P_INVALIDATOR_H_
 #define SYNC_NOTIFIER_P2P_INVALIDATOR_H_
 
@@ skipping 80 matching lines @@
 class SYNC_EXPORT_PRIVATE P2PInvalidator
     : public Invalidator,
       public NON_EXPORTED_BASE(notifier::PushClientObserver) {
  public:
   // The |send_notification_target| parameter was added to allow us to send
   // self-notifications in some cases, but not others.  The value should be
   // either NOTIFY_ALL to send notifications to all clients, or NOTIFY_OTHERS
   // 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();
 
   // Invalidator implementation.
   virtual void RegisterHandler(InvalidationHandler* handler) OVERRIDE;
   virtual void UpdateRegisteredIds(InvalidationHandler* handler,
                                    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(
       const ObjectIdInvalidationMap& invalidation_map) OVERRIDE;
 
   // PushClientObserver implementation.
   virtual void OnNotificationsEnabled() OVERRIDE;
   virtual void OnNotificationsDisabled(
       notifier::NotificationsDisabledReason reason) OVERRIDE;
   virtual void OnIncomingNotification(
       const notifier::Notification& notification) OVERRIDE;
 
   void SendNotificationDataForTest(
       const P2PNotificationData& notification_data);
 
  private:
   void SendNotificationData(const P2PNotificationData& notification_data);
 
   base::ThreadChecker thread_checker_;
 
   InvalidatorRegistrar registrar_;
 
   // 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_;
   // Which set of clients should be sent notifications.
   P2PNotificationTarget send_notification_target_;
 
   DISALLOW_COPY_AND_ASSIGN(P2PInvalidator);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_NOTIFIER_P2P_INVALIDATOR_H_