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

components/search_engines/search_engine_data_type_controller_unittest.cc

 // Copyright (c) 2012 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 "components/search_engines/search_engine_data_type_controller.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 27 matching lines @@
   SyncSearchEngineDataTypeControllerTest()
       : syncer::FakeSyncClient(&profile_sync_factory_),
         template_url_service_(nullptr, 0),
         search_engine_dtc_(base::Closure(), this, &template_url_service_) {
     // Disallow the TemplateURLService from loading until
     // PreloadTemplateURLService() is called .
     template_url_service_.set_disable_load(true);
   }
 
   // FakeSyncClient overrides.
-  base::WeakPtr<syncer::SyncableService> GetSyncableServiceForType(
-      syncer::ModelType type) override {
-    return syncable_service_.AsWeakPtr();
+  ServiceProvider GetSyncableServiceForType(syncer::ModelType type) override {
+    return base::Bind(&syncer::SyncableService::AsWeakPtr,
+                      base::Unretained(&syncable_service_));
   }
 
   void TearDown() override {
     // Must be done before we pump the loop.
     syncable_service_.StopSyncing(syncer::SEARCH_ENGINES);
   }
 
  protected:
   void PreloadTemplateURLService() {
     template_url_service_.set_disable_load(false);
     template_url_service_.Load();
   }
 
   void SetStartExpectations() {
     search_engine_dtc_.SetGenericChangeProcessorFactoryForTest(
         base::WrapUnique<syncer::GenericChangeProcessorFactory>(
             new syncer::FakeGenericChangeProcessorFactory(
                 base::MakeUnique<syncer::FakeGenericChangeProcessor>(
-                    syncer::SEARCH_ENGINES, this))));
+                    syncer::SEARCH_ENGINES))));
     EXPECT_CALL(model_load_callback_, Run(_, _));
   }
 
   void Start() {
     search_engine_dtc_.LoadModels(
         base::Bind(&syncer::ModelLoadCallbackMock::Run,
                    base::Unretained(&model_load_callback_)));
     search_engine_dtc_.StartAssociating(base::Bind(
         &syncer::StartCallbackMock::Run, base::Unretained(&start_callback_)));
     base::RunLoop().RunUntilIdle();
@@ skipping 94 matching lines @@
   EXPECT_FALSE(syncable_service_.syncing());
   search_engine_dtc_.Stop();
   EXPECT_EQ(NULL, search_engine_dtc_.GetSubscriptionForTesting());
   EXPECT_EQ(syncer::DataTypeController::NOT_RUNNING,
             search_engine_dtc_.state());
   EXPECT_FALSE(syncable_service_.syncing());
 }
 
 }  // namespace
 }  // namespace browser_sync