[Sync] Remove SyncClient dep from SyncBackendRegistrar.

components/sync/driver/glue/sync_backend_registrar_unittest.cc

Index: components/sync/driver/glue/sync_backend_registrar_unittest.cc
diff --git a/components/sync/driver/glue/sync_backend_registrar_unittest.cc b/components/sync/driver/glue/sync_backend_registrar_unittest.cc
index a6f71b5dabf07b2a91e301a43c11370d747f843a..a99aacba9f23c733a30c79eabf6050941b3c2c96 100644
--- a/components/sync/driver/glue/sync_backend_registrar_unittest.cc
+++ b/components/sync/driver/glue/sync_backend_registrar_unittest.cc
@@ -12,9 +12,7 @@
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread.h"
 #include "components/sync/driver/change_processor_mock.h"
-#include "components/sync/driver/fake_sync_client.h"
 #include "components/sync/driver/glue/browser_thread_model_worker.h"
-#include "components/sync/driver/sync_api_component_factory_mock.h"
 #include "components/sync/engine/passive_model_worker.h"
 #include "components/sync/syncable/test_user_share.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -29,73 +27,21 @@ using ::testing::InSequence;
 using ::testing::Return;
 using ::testing::StrictMock;
 
-void TriggerChanges(SyncBackendRegistrar* registrar, ModelType type) {
-  registrar->OnChangesApplied(type, 0, nullptr, ImmutableChangeRecordList());
-  registrar->OnChangesComplete(type);
-}
-
-class RegistrarSyncClient : public FakeSyncClient {
- public:
-  RegistrarSyncClient(
-      const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner,
-      const scoped_refptr<base::SingleThreadTaskRunner>& db_task_runner,
-      const scoped_refptr<base::SingleThreadTaskRunner>& file_task_runner)
-      : ui_task_runner_(ui_task_runner),
-        db_task_runner_(db_task_runner),
-        file_task_runner_(file_task_runner) {}
-
-  scoped_refptr<ModelSafeWorker> CreateModelWorkerForGroup(
-      ModelSafeGroup group) override {
-    switch (group) {
-      case GROUP_UI:
-        return new BrowserThreadModelWorker(ui_task_runner_, group);
-      case GROUP_DB:
-        return new BrowserThreadModelWorker(db_task_runner_, group);
-      case GROUP_FILE:
-        return new BrowserThreadModelWorker(file_task_runner_, group);
-      case GROUP_PASSIVE:
-        return new PassiveModelWorker();
-      default:
-        return nullptr;
-    }
-  }
-
- private:
-  const scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
-  const scoped_refptr<base::SingleThreadTaskRunner> db_task_runner_;
-  const scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_;
-};
-
-// Flaky: https://crbug.com/498238
 class SyncBackendRegistrarTest : public testing::Test {
  public:
-  void TestNonUIDataTypeActivationAsync(ChangeProcessor* processor,
-                                        base::WaitableEvent* done) {
-    registrar_->ActivateDataType(AUTOFILL, GROUP_DB, processor,
-                                 test_user_share_.user_share());
-    ExpectRoutingInfo(registrar_.get(), {{AUTOFILL, GROUP_DB}});
-    ExpectHasProcessorsForTypes(*registrar_, ModelTypeSet(AUTOFILL));
-    TriggerChanges(registrar_.get(), AUTOFILL);
-    done->Signal();
-  }
-
- protected:
   SyncBackendRegistrarTest()
       : db_thread_("DBThreadForTest"),
         file_thread_("FileThreadForTest"),
         sync_thread_("SyncThreadForTest") {}
 
-  ~SyncBackendRegistrarTest() override {}
-
   void SetUp() override {
     db_thread_.StartAndWaitForTesting();
     file_thread_.StartAndWaitForTesting();
     sync_thread_.StartAndWaitForTesting();
     test_user_share_.SetUp();
-    sync_client_ = base::MakeUnique<RegistrarSyncClient>(
-        ui_task_runner(), db_task_runner(), file_task_runner());
-    registrar_ =
-        base::MakeUnique<SyncBackendRegistrar>("test", sync_client_.get());
+    registrar_ = base::MakeUnique<SyncBackendRegistrar>(
+        "test", base::Bind(&SyncBackendRegistrarTest::CreateModelWorkerForGroup,
+                           base::Unretained(this)));
   }
 
   void TearDown() override {
@@ -105,15 +51,18 @@ class SyncBackendRegistrarTest : public testing::Test {
     sync_thread_.FlushForTesting();
   }
 
-  void ExpectRoutingInfo(SyncBackendRegistrar* registrar,
-                         const ModelSafeRoutingInfo& expected_routing_info) {
+  void TriggerChanges(ModelType type) {
+    registrar_->OnChangesApplied(type, 0, nullptr, ImmutableChangeRecordList());
+    registrar_->OnChangesComplete(type);
+  }
+
+  void ExpectRoutingInfo(const ModelSafeRoutingInfo& expected_routing_info) {
     ModelSafeRoutingInfo actual_routing_info;
-    registrar->GetModelSafeRoutingInfo(&actual_routing_info);
+    registrar_->GetModelSafeRoutingInfo(&actual_routing_info);
     EXPECT_EQ(expected_routing_info, actual_routing_info);
   }
 
-  void ExpectHasProcessorsForTypes(const SyncBackendRegistrar& registrar,
-                                   ModelTypeSet types) {
+  void ExpectHasProcessorsForTypes(ModelTypeSet types) {
     for (int i = FIRST_REAL_MODEL_TYPE; i < MODEL_TYPE_COUNT; ++i) {
       ModelType model_type = ModelTypeFromInt(i);
       EXPECT_EQ(types.Has(model_type),
@@ -127,16 +76,37 @@ class SyncBackendRegistrarTest : public testing::Test {
     return workers.size();
   }
 
-  const scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner() {
-    return message_loop_.task_runner();
+  // Part of the ActivateDeactivateNonUIDataType test below.
+  void TestNonUIDataTypeActivationAsync(ChangeProcessor* processor,
+                                        base::WaitableEvent* done) {
+    registrar_->ActivateDataType(AUTOFILL, GROUP_DB, processor, user_share());
+    ExpectRoutingInfo({{AUTOFILL, GROUP_DB}});
+    ExpectHasProcessorsForTypes(ModelTypeSet(AUTOFILL));
+    TriggerChanges(AUTOFILL);
+    done->Signal();
   }
 
-  const scoped_refptr<base::SingleThreadTaskRunner> db_task_runner() {
+  SyncBackendRegistrar* registrar() { return registrar_.get(); }
+  UserShare* user_share() { return test_user_share_.user_share(); }
+  scoped_refptr<base::SingleThreadTaskRunner> db_task_runner() {
     return db_thread_.task_runner();
   }
 
-  const scoped_refptr<base::SingleThreadTaskRunner> file_task_runner() {
-    return db_thread_.task_runner();
+ private:
+  scoped_refptr<ModelSafeWorker> CreateModelWorkerForGroup(
+      ModelSafeGroup group) {
+    switch (group) {
+      case GROUP_UI:
+        return new BrowserThreadModelWorker(message_loop_.task_runner(), group);
+      case GROUP_DB:
+        return new BrowserThreadModelWorker(db_thread_.task_runner(), group);
+      case GROUP_FILE:
+        return new BrowserThreadModelWorker(file_thread_.task_runner(), group);
+      case GROUP_PASSIVE:
+        return new PassiveModelWorker();
+      default:
+        return nullptr;
+    }
   }
 
   base::MessageLoop message_loop_;
@@ -145,78 +115,76 @@ class SyncBackendRegistrarTest : public testing::Test {
   base::Thread sync_thread_;
 
   TestUserShare test_user_share_;
-  std::unique_ptr<RegistrarSyncClient> sync_client_;
   std::unique_ptr<SyncBackendRegistrar> registrar_;
 };
 
 TEST_F(SyncBackendRegistrarTest, ConstructorEmpty) {
-  registrar_->SetInitialTypes(ModelTypeSet());
-  EXPECT_FALSE(registrar_->IsNigoriEnabled());
+  registrar()->SetInitialTypes(ModelTypeSet());
+  EXPECT_FALSE(registrar()->IsNigoriEnabled());
   EXPECT_EQ(4u, GetWorkersSize());
-  ExpectRoutingInfo(registrar_.get(), ModelSafeRoutingInfo());
-  ExpectHasProcessorsForTypes(*registrar_, ModelTypeSet());
+  ExpectRoutingInfo(ModelSafeRoutingInfo());
+  ExpectHasProcessorsForTypes(ModelTypeSet());
 }
 
 TEST_F(SyncBackendRegistrarTest, ConstructorNonEmpty) {
-  registrar_->RegisterNonBlockingType(BOOKMARKS);
-  registrar_->SetInitialTypes(ModelTypeSet(BOOKMARKS, NIGORI, PASSWORDS));
-  EXPECT_TRUE(registrar_->IsNigoriEnabled());
+  registrar()->RegisterNonBlockingType(BOOKMARKS);
+  registrar()->SetInitialTypes(ModelTypeSet(BOOKMARKS, NIGORI, PASSWORDS));
+  EXPECT_TRUE(registrar()->IsNigoriEnabled());
   EXPECT_EQ(4u, GetWorkersSize());
-  EXPECT_EQ(ModelTypeSet(NIGORI), registrar_->GetLastConfiguredTypes());
+  EXPECT_EQ(ModelTypeSet(NIGORI), registrar()->GetLastConfiguredTypes());
   // Bookmarks dropped because it is nonblocking.
   // Passwords dropped because of no password store.
-  ExpectRoutingInfo(registrar_.get(), {{NIGORI, GROUP_PASSIVE}});
-  ExpectHasProcessorsForTypes(*registrar_, ModelTypeSet());
+  ExpectRoutingInfo({{NIGORI, GROUP_PASSIVE}});
+  ExpectHasProcessorsForTypes(ModelTypeSet());
 }
 
 TEST_F(SyncBackendRegistrarTest, ConstructorNonEmptyReversedInitialization) {
   // The blocking types get to set initial types before NonBlocking types here.
-  registrar_->SetInitialTypes(ModelTypeSet(BOOKMARKS, NIGORI, PASSWORDS));
-  registrar_->RegisterNonBlockingType(BOOKMARKS);
-  EXPECT_TRUE(registrar_->IsNigoriEnabled());
+  registrar()->SetInitialTypes(ModelTypeSet(BOOKMARKS, NIGORI, PASSWORDS));
+  registrar()->RegisterNonBlockingType(BOOKMARKS);
+  EXPECT_TRUE(registrar()->IsNigoriEnabled());
   EXPECT_EQ(4u, GetWorkersSize());
-  EXPECT_EQ(ModelTypeSet(NIGORI), registrar_->GetLastConfiguredTypes());
+  EXPECT_EQ(ModelTypeSet(NIGORI), registrar()->GetLastConfiguredTypes());
   // Bookmarks dropped because it is nonblocking.
   // Passwords dropped because of no password store.
-  ExpectRoutingInfo(registrar_.get(), {{NIGORI, GROUP_PASSIVE}});
-  ExpectHasProcessorsForTypes(*registrar_, ModelTypeSet());
+  ExpectRoutingInfo({{NIGORI, GROUP_PASSIVE}});
+  ExpectHasProcessorsForTypes(ModelTypeSet());
 }
 
 TEST_F(SyncBackendRegistrarTest, ConfigureDataTypes) {
-  registrar_->RegisterNonBlockingType(BOOKMARKS);
-  registrar_->SetInitialTypes(ModelTypeSet());
+  registrar()->RegisterNonBlockingType(BOOKMARKS);
+  registrar()->SetInitialTypes(ModelTypeSet());
 
   // Add.
   const ModelTypeSet types1(BOOKMARKS, NIGORI, AUTOFILL);
-  EXPECT_EQ(types1, registrar_->ConfigureDataTypes(types1, ModelTypeSet()));
-  ExpectRoutingInfo(registrar_.get(), {{BOOKMARKS, GROUP_NON_BLOCKING},
-                                       {NIGORI, GROUP_PASSIVE},
-                                       {AUTOFILL, GROUP_PASSIVE}});
-  ExpectHasProcessorsForTypes(*registrar_, ModelTypeSet());
-  EXPECT_EQ(types1, registrar_->GetLastConfiguredTypes());
+  EXPECT_EQ(types1, registrar()->ConfigureDataTypes(types1, ModelTypeSet()));
+  ExpectRoutingInfo({{BOOKMARKS, GROUP_NON_BLOCKING},
+                     {NIGORI, GROUP_PASSIVE},
+                     {AUTOFILL, GROUP_PASSIVE}});
+  ExpectHasProcessorsForTypes(ModelTypeSet());
+  EXPECT_EQ(types1, registrar()->GetLastConfiguredTypes());
 
   // Add and remove.
   const ModelTypeSet types2(PREFERENCES, THEMES);
-  EXPECT_EQ(types2, registrar_->ConfigureDataTypes(types2, types1));
+  EXPECT_EQ(types2, registrar()->ConfigureDataTypes(types2, types1));
 
-  ExpectRoutingInfo(registrar_.get(),
-                    {{PREFERENCES, GROUP_PASSIVE}, {THEMES, GROUP_PASSIVE}});
-  ExpectHasProcessorsForTypes(*registrar_, ModelTypeSet());
-  EXPECT_EQ(types2, registrar_->GetLastConfiguredTypes());
+  ExpectRoutingInfo({{PREFERENCES, GROUP_PASSIVE}, {THEMES, GROUP_PASSIVE}});
+  ExpectHasProcessorsForTypes(ModelTypeSet());
+  EXPECT_EQ(types2, registrar()->GetLastConfiguredTypes());
 
   // Remove.
-  EXPECT_TRUE(registrar_->ConfigureDataTypes(ModelTypeSet(), types2).Empty());
-  ExpectRoutingInfo(registrar_.get(), ModelSafeRoutingInfo());
-  ExpectHasProcessorsForTypes(*registrar_, ModelTypeSet());
-  EXPECT_EQ(ModelTypeSet(), registrar_->GetLastConfiguredTypes());
+  EXPECT_TRUE(registrar()->ConfigureDataTypes(ModelTypeSet(), types2).Empty());
+  ExpectRoutingInfo(ModelSafeRoutingInfo());
+  ExpectHasProcessorsForTypes(ModelTypeSet());
+  EXPECT_EQ(ModelTypeSet(), registrar()->GetLastConfiguredTypes());
 }
 
 TEST_F(SyncBackendRegistrarTest, ActivateDeactivateUIDataType) {
   InSequence in_sequence;
-  registrar_->SetInitialTypes(ModelTypeSet());
+  registrar()->SetInitialTypes(ModelTypeSet());
 
   // Should do nothing.
-  TriggerChanges(registrar_.get(), BOOKMARKS);
+  TriggerChanges(BOOKMARKS);
 
   StrictMock<ChangeProcessorMock> change_processor_mock;
   EXPECT_CALL(change_processor_mock, StartImpl());
@@ -227,28 +195,28 @@ TEST_F(SyncBackendRegistrarTest, ActivateDeactivateUIDataType) {
   EXPECT_CALL(change_processor_mock, IsRunning()).WillRepeatedly(Return(false));
 
   const ModelTypeSet types(BOOKMARKS);
-  EXPECT_EQ(types, registrar_->ConfigureDataTypes(types, ModelTypeSet()));
-  registrar_->ActivateDataType(BOOKMARKS, GROUP_UI, &change_processor_mock,
-                               test_user_share_.user_share());
-  ExpectRoutingInfo(registrar_.get(), {{BOOKMARKS, GROUP_UI}});
-  ExpectHasProcessorsForTypes(*registrar_, types);
+  EXPECT_EQ(types, registrar()->ConfigureDataTypes(types, ModelTypeSet()));
+  registrar()->ActivateDataType(BOOKMARKS, GROUP_UI, &change_processor_mock,
+                                user_share());
+  ExpectRoutingInfo({{BOOKMARKS, GROUP_UI}});
+  ExpectHasProcessorsForTypes(types);
 
-  TriggerChanges(registrar_.get(), BOOKMARKS);
+  TriggerChanges(BOOKMARKS);
 
-  registrar_->DeactivateDataType(BOOKMARKS);
-  ExpectRoutingInfo(registrar_.get(), ModelSafeRoutingInfo());
-  ExpectHasProcessorsForTypes(*registrar_, ModelTypeSet());
+  registrar()->DeactivateDataType(BOOKMARKS);
+  ExpectRoutingInfo(ModelSafeRoutingInfo());
+  ExpectHasProcessorsForTypes(ModelTypeSet());
 
   // Should do nothing.
-  TriggerChanges(registrar_.get(), BOOKMARKS);
+  TriggerChanges(BOOKMARKS);
 }
 
 TEST_F(SyncBackendRegistrarTest, ActivateDeactivateNonUIDataType) {
   InSequence in_sequence;
-  registrar_->SetInitialTypes(ModelTypeSet());
+  registrar()->SetInitialTypes(ModelTypeSet());
 
   // Should do nothing.
-  TriggerChanges(registrar_.get(), AUTOFILL);
+  TriggerChanges(AUTOFILL);
 
   StrictMock<ChangeProcessorMock> change_processor_mock;
   EXPECT_CALL(change_processor_mock, StartImpl());
@@ -259,7 +227,7 @@ TEST_F(SyncBackendRegistrarTest, ActivateDeactivateNonUIDataType) {
   EXPECT_CALL(change_processor_mock, IsRunning()).WillRepeatedly(Return(false));
 
   const ModelTypeSet types(AUTOFILL);
-  EXPECT_EQ(types, registrar_->ConfigureDataTypes(types, ModelTypeSet()));
+  EXPECT_EQ(types, registrar()->ConfigureDataTypes(types, ModelTypeSet()));
 
   base::WaitableEvent done(base::WaitableEvent::ResetPolicy::AUTOMATIC,
                            base::WaitableEvent::InitialState::NOT_SIGNALED);
@@ -269,36 +237,36 @@ TEST_F(SyncBackendRegistrarTest, ActivateDeactivateNonUIDataType) {
                  base::Unretained(this), &change_processor_mock, &done));
   done.Wait();
 
-  registrar_->DeactivateDataType(AUTOFILL);
-  ExpectRoutingInfo(registrar_.get(), ModelSafeRoutingInfo());
-  ExpectHasProcessorsForTypes(*registrar_, ModelTypeSet());
+  registrar()->DeactivateDataType(AUTOFILL);
+  ExpectRoutingInfo(ModelSafeRoutingInfo());
+  ExpectHasProcessorsForTypes(ModelTypeSet());
 
   // Should do nothing.
-  TriggerChanges(registrar_.get(), AUTOFILL);
+  TriggerChanges(AUTOFILL);
 }
 
 // Tests that registration and configuration of non-blocking data types is
 // handled correctly in SyncBackendRegistrar.
 TEST_F(SyncBackendRegistrarTest, ConfigureNonBlockingDataType) {
-  registrar_->RegisterNonBlockingType(AUTOFILL);
-  registrar_->RegisterNonBlockingType(BOOKMARKS);
+  registrar()->RegisterNonBlockingType(AUTOFILL);
+  registrar()->RegisterNonBlockingType(BOOKMARKS);
 
-  ExpectRoutingInfo(registrar_.get(), ModelSafeRoutingInfo());
+  ExpectRoutingInfo(ModelSafeRoutingInfo());
   // Simulate that initial sync was already done for AUTOFILL.
-  registrar_->AddRestoredNonBlockingType(AUTOFILL);
+  registrar()->AddRestoredNonBlockingType(AUTOFILL);
   // It should be added to routing info and set of configured types.
-  EXPECT_EQ(ModelTypeSet(AUTOFILL), registrar_->GetLastConfiguredTypes());
-  ExpectRoutingInfo(registrar_.get(), {{AUTOFILL, GROUP_NON_BLOCKING}});
+  EXPECT_EQ(ModelTypeSet(AUTOFILL), registrar()->GetLastConfiguredTypes());
+  ExpectRoutingInfo({{AUTOFILL, GROUP_NON_BLOCKING}});
 
   // Configure two non-blocking types. Initial sync wasn't done for BOOKMARKS so
   // it should be included in types to be downloaded.
   ModelTypeSet types_to_add(AUTOFILL, BOOKMARKS);
   ModelTypeSet newly_added_types =
-      registrar_->ConfigureDataTypes(types_to_add, ModelTypeSet());
+      registrar()->ConfigureDataTypes(types_to_add, ModelTypeSet());
   EXPECT_EQ(ModelTypeSet(BOOKMARKS), newly_added_types);
-  EXPECT_EQ(types_to_add, registrar_->GetLastConfiguredTypes());
-  ExpectRoutingInfo(registrar_.get(), {{AUTOFILL, GROUP_NON_BLOCKING},
-                                       {BOOKMARKS, GROUP_NON_BLOCKING}});
+  EXPECT_EQ(types_to_add, registrar()->GetLastConfiguredTypes());
+  ExpectRoutingInfo(
+      {{AUTOFILL, GROUP_NON_BLOCKING}, {BOOKMARKS, GROUP_NON_BLOCKING}});
 }
 
 }  // namespace