Separate sync and invalidation client IDs

sync/sessions/sync_session_context.h

Index: sync/sessions/sync_session_context.h
diff --git a/sync/sessions/sync_session_context.h b/sync/sessions/sync_session_context.h
index d47c3e2efac0819f9a9237bfe6fea18ec286b393..21c8bf2ae64a0f1cecf6099afa37d0c7a0dcd43e 100644
--- a/sync/sessions/sync_session_context.h
+++ b/sync/sessions/sync_session_context.h
@@ -56,7 +56,8 @@ class SYNC_EXPORT_PRIVATE SyncSessionContext {
                      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();
 
@@ -130,6 +131,10 @@ class SYNC_EXPORT_PRIVATE SyncSessionContext {
     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
@@ -178,6 +183,8 @@ class SYNC_EXPORT_PRIVATE SyncSessionContext {
   // the experiment is not enabled.
   bool keystore_encryption_enabled_;
 
+  const std::string invalidator_client_id_;
+
   DISALLOW_COPY_AND_ASSIGN(SyncSessionContext);
 };