Support for shared invalidator client IDs

chrome/browser/invalidation/invalidation_service_android_unittest.cc

Index: chrome/browser/invalidation/invalidation_service_android_unittest.cc
diff --git a/chrome/browser/invalidation/invalidation_service_android_unittest.cc b/chrome/browser/invalidation/invalidation_service_android_unittest.cc
index e97137b9adbec1c7985af02ad2dbee4b2860d8a9..d652bee9aa1a8000cc5d77b209d891f001910bdb 100644
--- a/chrome/browser/invalidation/invalidation_service_android_unittest.cc
+++ b/chrome/browser/invalidation/invalidation_service_android_unittest.cc
@@ -145,4 +145,32 @@ TEST_F(InvalidationServiceAndroidRegistrationTest, UpdateObjectRegistration) {
   invalidation_service().UnregisterInvalidationHandler(&handler);
 }
 
+#if defined(OS_ANDROID)
+
+class InvalidationServiceAndroidTest : public testing::Test {
+ public:
+  InvalidationServiceAndroidTest()
+      : invalidation_service_(&profile_, new InvalidationControllerAndroid()) {}
+  virtual ~InvalidationServiceAndroidTest() {}
+
+  InvalidationService& invalidation_service() {
+    return invalidation_service_;
+  }
+
+ private:
+  TestingProfile profile_;
+  InvalidationServiceAndroid invalidation_service_;
+};
+
+TEST_F(InvalidationServiceAndroidTest, FetchClientId) {
+  const std::string id1 = invalidation_service().GetInvalidatorClientId();
+  ASSERT_FALSE(id1.empty());
+
+  // If nothing else, the ID should be consistent.
+  const std::string id2 = invalidation_service().GetInvalidatorClientId();
+  ASSERT_EQ(id1, id2);
+}
+
+#endif
+
 }  // namespace invalidation