Support for shared invalidator client IDs

chrome/browser/invalidation/invalidation_controller_android.h

Index: chrome/browser/invalidation/invalidation_controller_android.h
diff --git a/chrome/browser/invalidation/invalidation_controller_android.h b/chrome/browser/invalidation/invalidation_controller_android.h
index 28fc0c593dab858ad85dc9f9a42bb31c6b3325e7..05839ad31d288964d8562c3ba1ce4c8d8c6dd220 100644
--- a/chrome/browser/invalidation/invalidation_controller_android.h
+++ b/chrome/browser/invalidation/invalidation_controller_android.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_INVALIDATION_INVALIDATION_CONTROLLER_ANDROID_H_
 #define CHROME_BROWSER_INVALIDATION_INVALIDATION_CONTROLLER_ANDROID_H_
 
+#include <string>
+
 #include "base/android/jni_android.h"
 #include "base/android/jni_helper.h"
 #include "sync/notifier/invalidation_util.h"
@@ -22,6 +24,9 @@ class InvalidationControllerAndroid {
   // notification.
   virtual void SetRegisteredObjectIds(const syncer::ObjectIdSet& ids);
 
+  // Asks the Java code to return the client ID it chose to use.
+  std::string GetInvalidatorClientId();
+
  private:
   // The Java invalidation controller.
   base::android::ScopedJavaGlobalRef<jobject> invalidation_controller_;