Separate sync and invalidation client IDs

sync/notifier/invalidation_notifier.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 implementation of Invalidator that wraps an invalidation
 // client.  Handles the details of connecting to XMPP and hooking it
 // up to the invalidation client.
 //
 // You probably don't want to use this directly; use
 // NonBlockingInvalidationNotifier.
@@ skipping 24 matching lines @@
 // This class must live on the IO thread.
 // TODO(dcheng): Think of a name better than InvalidationInvalidator.
 class SYNC_EXPORT_PRIVATE InvalidationNotifier
     : public Invalidator,
       public SyncInvalidationListener::Delegate,
       public base::NonThreadSafe {
  public:
   // |invalidation_state_tracker| must be initialized.
   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,
       const std::string& client_info);
 
   virtual ~InvalidationNotifier();
 
   // 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;
 
   // SyncInvalidationListener::Delegate implementation.
   virtual void OnInvalidate(
       const ObjectIdInvalidationMap& invalidation_map) OVERRIDE;
   virtual void OnInvalidatorStateChange(InvalidatorState state) OVERRIDE;
 
@@ skipping 15 matching lines @@
   const InvalidationStateMap initial_invalidation_state_map_;
 
   // Passed to |invalidation_listener_|.
   const WeakHandle<InvalidationStateTracker>
       invalidation_state_tracker_;
 
   // Passed to |invalidation_listener_|.
   const std::string client_info_;
 
   // The client ID to pass to |invalidation_listener_|.
-  std::string client_id_;
+  const std::string invalidator_client_id_;
 
   // The initial bootstrap data to pass to |invalidation_listener_|.
   const std::string invalidation_bootstrap_data_;
 
   // The invalidation listener.
   SyncInvalidationListener invalidation_listener_;
 
   DISALLOW_COPY_AND_ASSIGN(InvalidationNotifier);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_NOTIFIER_INVALIDATION_NOTIFIER_H_