Separate invalidator and sync client ID (part 2/2)

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 44c172532b2717a6f3a383cbdcdedfb35ec47c49..81773275d57b3b5a2fa35a51c944f72ab38998a8 100644
--- a/sync/notifier/sync_invalidation_listener_unittest.cc
+++ b/sync/notifier/sync_invalidation_listener_unittest.cc
@@ -277,11 +277,6 @@ 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() {
@@ -424,14 +419,6 @@ class SyncInvalidationListenerTest : public testing::Test {
   FakeDelegate fake_delegate_;
 };
 
-// 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) {