Migrate invalidator client IDs out of sync

sync/notifier/sync_invalidation_listener_unittest.cc

Index: sync/notifier/sync_invalidation_listener_unittest.cc
diff --git a/sync/notifier/sync_invalidation_listener_unittest.cc b/sync/notifier/sync_invalidation_listener_unittest.cc
index 4ab5b99e732f0a750896d0185cd6701d01b9965a..37016a880ffe694428e504b307eb88808b80ab42 100644
--- a/sync/notifier/sync_invalidation_listener_unittest.cc
+++ b/sync/notifier/sync_invalidation_listener_unittest.cc
@@ -226,6 +226,10 @@ class SyncInvalidationListenerTest : public testing::Test {
     return fake_tracker_.GetMaxVersion(id);
   }
 
+  std::string GetInvalidatorClientId() const {
+    return fake_tracker_.GetInvalidatorClientId();
+  }
+
   std::string GetBootstrapData() const {
     return fake_tracker_.GetBootstrapData();
   }
@@ -300,6 +304,11 @@ class SyncInvalidationListenerTest : public testing::Test {
                   MakeWeakHandle(fake_tracker_.AsWeakPtr()),
                   &fake_delegate_);
     DCHECK(fake_invalidation_client_);
+
+    // TODO(rlarocque): This is necessary for the deferred write of the client
+    // ID to take place.  We can remove this statement when we remove the
+    // WriteInvalidatorClientId test.  See crbug.com/124142.
+    message_loop_.RunUntilIdle();
   }
 
   void StopClient() {
@@ -326,6 +335,14 @@ class SyncInvalidationListenerTest : public testing::Test {
   SyncInvalidationListener client_;
 };
 
+// Verify the client ID is written to the state tracker on client start.
+// TODO(rlarocque): Remove this test when migration code is removed.
+// See crbug.com/124142.
+TEST_F(SyncInvalidationListenerTest, WriteInvalidatorClientId) {
+  // The client is started by the harness, so we don't have to do anything here.
+  EXPECT_EQ(kClientId, GetInvalidatorClientId());
+}
+
 // Write a new state to the client.  It should propagate to the
 // tracker.
 TEST_F(SyncInvalidationListenerTest, WriteState) {