Separate invalidator and sync client ID (part 2/2)

sync/notifier/invalidator_factory.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.
 
 #ifndef SYNC_NOTIFIER_INVALIDATOR_FACTORY_H_
 #define SYNC_NOTIFIER_INVALIDATOR_FACTORY_H_
 
 #include <string>
 
 #include "base/memory/weak_ptr.h"
@@ skipping 18 matching lines @@
       const std::string& client_info,
       const base::WeakPtr<InvalidationStateTracker>&
           invalidation_state_tracker);
   ~InvalidatorFactory();
 
   // Creates an invalidator. Caller takes ownership of the returned
   // object.  However, the returned object must not outlive the
   // factory from which it was created.  Can be called on any thread.
   Invalidator* CreateInvalidator();
 
+  // Returns the unique ID that was (or will be) passed to the invalidator.
+  std::string GetInvalidatorClientId() const;
+
  private:
   const notifier::NotifierOptions notifier_options_;
+
+  // Some of these should be const, but can't be set up in member initializers.
+  InvalidationStateMap initial_invalidation_state_map_;
   const std::string client_info_;
-  const InvalidationStateMap initial_invalidation_state_map_;
-  const std::string invalidation_bootstrap_data_;
-  const WeakHandle<InvalidationStateTracker>
-      invalidation_state_tracker_;
+  std::string invalidator_client_id_;
+  std::string invalidation_bootstrap_data_;
+  WeakHandle<InvalidationStateTracker> invalidation_state_tracker_;
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_NOTIFIER_INVALIDATOR_FACTORY_H_