Separate sync and invalidation client IDs

sync/sessions/sync_session_context.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.
 
 // SyncSessionContext encapsulates the contextual information and engine
 // components specific to a SyncSession. A context is accessible via
 // a SyncSession so that session SyncerCommands and parts of the engine have
 // a convenient way to access other parts. In this way it can be thought of as
 // the surrounding environment for the SyncSession. The components of this
 // environment are either valid or not valid for the entire context lifetime,
@@ skipping 38 matching lines @@
 class SYNC_EXPORT_PRIVATE SyncSessionContext {
  public:
   SyncSessionContext(ServerConnectionManager* connection_manager,
                      syncable::Directory* directory,
                      const std::vector<ModelSafeWorker*>& workers,
                      ExtensionsActivityMonitor* extensions_activity_monitor,
                      ThrottledDataTypeTracker* throttled_data_type_tracker,
                      const std::vector<SyncEngineEventListener*>& listeners,
                      DebugInfoGetter* debug_info_getter,
                      TrafficRecorder* traffic_recorder,
-                     bool keystore_encryption_enabled);
+                     bool keystore_encryption_enabled,
+                     const std::string& invalidator_client_id);
 
   ~SyncSessionContext();
 
   ServerConnectionManager* connection_manager() {
     return connection_manager_;
   }
   syncable::Directory* directory() {
     return directory_;
   }
 
@@ skipping 53 matching lines @@
   }
 
   void set_hierarchy_conflict_detected(bool value) {
     client_status_.set_hierarchy_conflict_detected(value);
   }
 
   const sync_pb::ClientStatus& client_status() const {
     return client_status_;
   }
 
+  const std::string& invalidator_client_id() const {
+    return invalidator_client_id_;
+  }
+
  private:
   // Rather than force clients to set and null-out various context members, we
   // extend our encapsulation boundary to scoped helpers that take care of this
   // once they are allocated. See definitions of these below.
   friend class TestScopedSessionEventListener;
 
   ObserverList<SyncEngineEventListener> listeners_;
 
   ServerConnectionManager* const connection_manager_;
   syncable::Directory* const directory_;
@@ skipping 28 matching lines @@
   TrafficRecorder* traffic_recorder_;
 
   // Satus information to be sent up to the server.
   sync_pb::ClientStatus client_status_;
 
   // Temporary variable while keystore encryption is behind a flag. True if
   // we should attempt performing keystore encryption related work, false if
   // the experiment is not enabled.
   bool keystore_encryption_enabled_;
 
+  const std::string invalidator_client_id_;
+
   DISALLOW_COPY_AND_ASSIGN(SyncSessionContext);
 };
 
 }  // namespace sessions
 }  // namespace syncer
 
 #endif  // SYNC_SESSIONS_SYNC_SESSION_CONTEXT_H_