Revert of [Sync] Stop accessing BrowserContextKeyedServiceFactory on non-UI thread.

components/search_engines/search_engine_data_type_controller_unittest.cc

Index: components/search_engines/search_engine_data_type_controller_unittest.cc
diff --git a/components/search_engines/search_engine_data_type_controller_unittest.cc b/components/search_engines/search_engine_data_type_controller_unittest.cc
index 8da634347d3cee22461f7a55a53a136a68371f3e..a9c072186443f8d32c0d2c0362259a3f7ec57dee 100644
--- a/components/search_engines/search_engine_data_type_controller_unittest.cc
+++ b/components/search_engines/search_engine_data_type_controller_unittest.cc
@@ -45,9 +45,9 @@
   }
 
   // FakeSyncClient overrides.
-  ServiceProvider GetSyncableServiceForType(syncer::ModelType type) override {
-    return base::Bind(&syncer::SyncableService::AsWeakPtr,
-                      base::Unretained(&syncable_service_));
+  base::WeakPtr<syncer::SyncableService> GetSyncableServiceForType(
+      syncer::ModelType type) override {
+    return syncable_service_.AsWeakPtr();
   }
 
   void TearDown() override {
@@ -66,7 +66,7 @@
         base::WrapUnique<syncer::GenericChangeProcessorFactory>(
             new syncer::FakeGenericChangeProcessorFactory(
                 base::MakeUnique<syncer::FakeGenericChangeProcessor>(
-                    syncer::SEARCH_ENGINES))));
+                    syncer::SEARCH_ENGINES, this))));
     EXPECT_CALL(model_load_callback_, Run(_, _));
   }