[Sync] Make BackendMigrator not wait for full sync cycles

chrome/browser/sync/glue/sync_backend_registrar_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/glue/sync_backend_registrar.h"
 
 #include "chrome/browser/sync/glue/change_processor_mock.h"
 #include "chrome/browser/sync/glue/ui_model_worker.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "chrome/test/base/testing_profile.h"
@@ skipping 56 matching lines @@
 
   MessageLoop loop_;
   TestUserShare test_user_share_;
 
  private:
   BrowserThread ui_thread_;
 };
 
 TEST_F(SyncBackendRegistrarTest, ConstructorEmpty) {
   TestingProfile profile;
-  SyncBackendRegistrar registrar(ModelTypeSet(),
-                                 &profile, &loop_);
+  SyncBackendRegistrar registrar(ModelTypeSet(), "test", &profile, &loop_);
   EXPECT_FALSE(registrar.IsNigoriEnabled());
   {
     std::vector<ModelSafeWorker*> workers;
     registrar.GetWorkers(&workers);
     EXPECT_EQ(3u, workers.size());
   }
   ExpectRoutingInfo(&registrar, ModelSafeRoutingInfo());
   ExpectHasProcessorsForTypes(&registrar, ModelTypeSet());
   registrar.OnSyncerShutdownComplete();
   registrar.StopOnUIThread();
 }
 
 TEST_F(SyncBackendRegistrarTest, ConstructorNonEmpty) {
   TestingProfile profile;
   ModelTypeSet initial_types;
   initial_types.insert(BOOKMARKS);
   initial_types.insert(NIGORI);
   initial_types.insert(PASSWORDS);
-  SyncBackendRegistrar registrar(initial_types,
-                                 &profile, &loop_);
+  SyncBackendRegistrar registrar(initial_types, "test", &profile, &loop_);
   EXPECT_TRUE(registrar.IsNigoriEnabled());
   {
     std::vector<ModelSafeWorker*> workers;
     registrar.GetWorkers(&workers);
     EXPECT_EQ(3u, workers.size());
   }
   {
     ModelSafeRoutingInfo expected_routing_info;
     expected_routing_info[BOOKMARKS] = GROUP_PASSIVE;
     expected_routing_info[NIGORI] = GROUP_PASSIVE;
     // Passwords dropped because of no password store.
     ExpectRoutingInfo(&registrar, expected_routing_info);
   }
   ExpectHasProcessorsForTypes(&registrar, ModelTypeSet());
   registrar.OnSyncerShutdownComplete();
   registrar.StopOnUIThread();
 }
 
 TEST_F(SyncBackendRegistrarTest, ConfigureDataTypes) {
   TestingProfile profile;
-  SyncBackendRegistrar registrar(ModelTypeSet(),
-                                 &profile, &loop_);
+  SyncBackendRegistrar registrar(ModelTypeSet(), "test", &profile, &loop_);
 
   // Add.
   ModelTypeSet types1;
   types1.insert(BOOKMARKS);
   types1.insert(NIGORI);
   types1.insert(AUTOFILL);
   EXPECT_EQ(types1, registrar.ConfigureDataTypes(types1, ModelTypeSet()));
   {
     ModelSafeRoutingInfo expected_routing_info;
     expected_routing_info[BOOKMARKS] = GROUP_PASSIVE;
@@ skipping 21 matching lines @@
   ExpectRoutingInfo(&registrar, ModelSafeRoutingInfo());
   ExpectHasProcessorsForTypes(&registrar, ModelTypeSet());
 
   registrar.OnSyncerShutdownComplete();
   registrar.StopOnUIThread();
 }
 
 TEST_F(SyncBackendRegistrarTest, ActivateDeactivateUIDataType) {
   InSequence in_sequence;
   TestingProfile profile;
-  SyncBackendRegistrar registrar(ModelTypeSet(), &profile, &loop_);
+  SyncBackendRegistrar registrar(ModelTypeSet(), "test", &profile, &loop_);
   StrictMock<ChangeProcessorMock> change_processor_mock;
   EXPECT_CALL(change_processor_mock, StartImpl(&profile));
   EXPECT_CALL(change_processor_mock, IsRunning())
       .WillRepeatedly(Return(true));
   EXPECT_CALL(change_processor_mock, StopImpl());
   EXPECT_CALL(change_processor_mock, IsRunning())
       .WillRepeatedly(Return(false));
 
   ModelTypeSet types;
   types.insert(BOOKMARKS);
@@ skipping 13 matching lines @@
   ExpectHasProcessorsForTypes(&registrar, ModelTypeSet());
 
   registrar.OnSyncerShutdownComplete();
   registrar.StopOnUIThread();
 }
 
 TEST_F(SyncBackendRegistrarTest, ActivateDeactivateNonUIDataType) {
   BrowserThread db_thread(BrowserThread::DB, &loop_);
   InSequence in_sequence;
   TestingProfile profile;
-  SyncBackendRegistrar registrar(ModelTypeSet(), &profile, &loop_);
+  SyncBackendRegistrar registrar(ModelTypeSet(), "test", &profile, &loop_);
   StrictMock<ChangeProcessorMock> change_processor_mock;
   EXPECT_CALL(change_processor_mock, StartImpl(&profile));
   EXPECT_CALL(change_processor_mock, IsRunning())
       .WillRepeatedly(Return(true));
   EXPECT_CALL(change_processor_mock, StopImpl());
   EXPECT_CALL(change_processor_mock, IsRunning())
       .WillRepeatedly(Return(false));
 
   ModelTypeSet types;
   types.insert(AUTOFILL);
@@ skipping 15 matching lines @@
   registrar.OnSyncerShutdownComplete();
   registrar.StopOnUIThread();
 }
 
 // TODO(akalin): Add tests for non-UI non-passive data types (see
 // http://crbug.com/93456).
 
 }  // namespace
 
 }  // namespace browser_sync