Separate sync and invalidation client IDs

sync/notifier/p2p_invalidator.cc

 // 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.
 
 #include "sync/notifier/p2p_invalidator.h"
 
 #include <algorithm>
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 140 matching lines @@
   }
   int source_num = 0;
   if (!data_dict->GetInteger(kSourceKey, &source_num)) {
     LOG(WARNING) << "Could not find integer value for " << kSourceKey;
   }
   source_ = P2PNotificationSourceFromInteger(source_num);
   return true;
 }
 
 P2PInvalidator::P2PInvalidator(scoped_ptr<notifier::PushClient> push_client,
+                               const std::string& invalidator_client_id,
                                P2PNotificationTarget send_notification_target)
     : push_client_(push_client.Pass()),
+      invalidator_client_id_(invalidator_client_id),
       logged_in_(false),
       notifications_enabled_(false),
       send_notification_target_(send_notification_target) {
   DCHECK(send_notification_target_ == NOTIFY_OTHERS ||
          send_notification_target_ == NOTIFY_ALL);
   push_client_->AddObserver(this);
 }
 
 P2PInvalidator::~P2PInvalidator() {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 10 matching lines @@
   // TODO(akalin): Handle arbitrary object IDs (http://crbug.com/140411).
   DCHECK(thread_checker_.CalledOnValidThread());
   ObjectIdSet new_ids;
   const ObjectIdSet& old_ids = registrar_.GetRegisteredIds(handler);
   std::set_difference(ids.begin(), ids.end(),
                       old_ids.begin(), old_ids.end(),
                       std::inserter(new_ids, new_ids.end()),
                       ObjectIdLessThan());
   registrar_.UpdateRegisteredIds(handler, ids);
   const P2PNotificationData notification_data(
-      unique_id_, NOTIFY_SELF, ObjectIdSetToInvalidationMap(new_ids, ""),
-      REMOTE_INVALIDATION);
+      invalidator_client_id_, NOTIFY_SELF,
+      ObjectIdSetToInvalidationMap(new_ids, ""), REMOTE_INVALIDATION);
   SendNotificationData(notification_data);
 }
 
 void P2PInvalidator::UnregisterHandler(InvalidationHandler* handler) {
   DCHECK(thread_checker_.CalledOnValidThread());
   registrar_.UnregisterHandler(handler);
 }
 
 InvalidatorState P2PInvalidator::GetInvalidatorState() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   return registrar_.GetInvalidatorState();
 }
 
-void P2PInvalidator::SetUniqueId(const std::string& unique_id) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  unique_id_ = unique_id;
-}
-
 void P2PInvalidator::UpdateCredentials(
     const std::string& email, const std::string& token) {
   DCHECK(thread_checker_.CalledOnValidThread());
   notifier::Subscription subscription;
   subscription.channel = kSyncP2PNotificationChannel;
   // There may be some subtle issues around case sensitivity of the
   // from field, but it doesn't matter too much since this is only
   // used in p2p mode (which is only used in testing).
   subscription.from = email;
   push_client_->UpdateSubscriptions(
       notifier::SubscriptionList(1, subscription));
   // If already logged in, the new credentials will take effect on the
   // next reconnection.
   push_client_->UpdateCredentials(email, token);
   logged_in_ = true;
 }
 
 void P2PInvalidator::SendInvalidation(
     const ObjectIdInvalidationMap& invalidation_map) {
   DCHECK(thread_checker_.CalledOnValidThread());
   const P2PNotificationData notification_data(
-      unique_id_, send_notification_target_, invalidation_map,
+      invalidator_client_id_, send_notification_target_, invalidation_map,
       REMOTE_INVALIDATION);
   SendNotificationData(notification_data);
 }
 
 void P2PInvalidator::OnNotificationsEnabled() {
   DCHECK(thread_checker_.CalledOnValidThread());
   bool just_turned_on = (notifications_enabled_ == false);
   notifications_enabled_ = true;
   registrar_.UpdateInvalidatorState(INVALIDATIONS_ENABLED);
   if (just_turned_on) {
     const P2PNotificationData notification_data(
-        unique_id_, NOTIFY_SELF,
+        invalidator_client_id_, NOTIFY_SELF,
         ObjectIdSetToInvalidationMap(registrar_.GetAllRegisteredIds(), ""),
         REMOTE_INVALIDATION);
     SendNotificationData(notification_data);
   }
 }
 
 void P2PInvalidator::OnNotificationsDisabled(
     notifier::NotificationsDisabledReason reason) {
   DCHECK(thread_checker_.CalledOnValidThread());
   registrar_.UpdateInvalidatorState(FromNotifierReason(reason));
@@ skipping 14 matching lines @@
   if (notification.channel != kSyncP2PNotificationChannel) {
     LOG(WARNING) << "Notification from unexpected source "
                  << notification.channel;
   }
   P2PNotificationData notification_data;
   if (!notification_data.ResetFromString(notification.data)) {
     LOG(WARNING) << "Could not parse notification data from "
                  << notification.data;
     notification_data =
         P2PNotificationData(
-            unique_id_, NOTIFY_ALL,
+            invalidator_client_id_, NOTIFY_ALL,
             ObjectIdSetToInvalidationMap(registrar_.GetAllRegisteredIds(), ""),
             REMOTE_INVALIDATION);
   }
-  if (!notification_data.IsTargeted(unique_id_)) {
+  if (!notification_data.IsTargeted(invalidator_client_id_)) {
     DVLOG(1) << "Not a target of the notification -- "
              << "not emitting notification";
     return;
   }
   registrar_.DispatchInvalidationsToHandlers(
       notification_data.GetIdInvalidationMap(),
       REMOTE_INVALIDATION);
 }
 
 void P2PInvalidator::SendNotificationDataForTest(
@@ skipping 11 matching lines @@
     return;
   }
   notifier::Notification notification;
   notification.channel = kSyncP2PNotificationChannel;
   notification.data = notification_data.ToString();
   DVLOG(1) << "Sending XMPP notification: " << notification.ToString();
   push_client_->SendNotification(notification);
 }
 
 }  // namespace syncer