Separate sync and invalidation client IDs

sync/notifier/invalidation_notifier.cc

Index: sync/notifier/invalidation_notifier.cc
diff --git a/sync/notifier/invalidation_notifier.cc b/sync/notifier/invalidation_notifier.cc
index bd494265cd94b1c5d686a73e24fe9e4a38d64c1d..076d71db8f0d70e4a55d613964f2377138286b6b 100644
--- a/sync/notifier/invalidation_notifier.cc
+++ b/sync/notifier/invalidation_notifier.cc
@@ -19,6 +19,7 @@ namespace syncer {
 
 InvalidationNotifier::InvalidationNotifier(
     scoped_ptr<notifier::PushClient> push_client,
+    const std::string& invalidator_client_id,
     const InvalidationStateMap& initial_invalidation_state_map,
     const std::string& invalidation_bootstrap_data,
     const WeakHandle<InvalidationStateTracker>& invalidation_state_tracker,
@@ -27,6 +28,7 @@ InvalidationNotifier::InvalidationNotifier(
       initial_invalidation_state_map_(initial_invalidation_state_map),
       invalidation_state_tracker_(invalidation_state_tracker),
       client_info_(client_info),
+      invalidator_client_id_(invalidator_client_id),
       invalidation_bootstrap_data_(invalidation_bootstrap_data),
       invalidation_listener_(push_client.Pass()) {
 }
@@ -57,19 +59,12 @@ InvalidatorState InvalidationNotifier::GetInvalidatorState() const {
   return registrar_.GetInvalidatorState();
 }
 
-void InvalidationNotifier::SetUniqueId(const std::string& unique_id) {
-  DCHECK(CalledOnValidThread());
-  client_id_ = unique_id;
-  DVLOG(1) << "Setting unique ID to " << unique_id;
-  CHECK(!client_id_.empty());
-}
-
 void InvalidationNotifier::UpdateCredentials(
     const std::string& email, const std::string& token) {
   if (state_ == STOPPED) {
     invalidation_listener_.Start(
         base::Bind(&invalidation::CreateInvalidationClient),
-        client_id_, client_info_, invalidation_bootstrap_data_,
+        invalidator_client_id_, client_info_, invalidation_bootstrap_data_,
         initial_invalidation_state_map_,
         invalidation_state_tracker_,
         this);