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

components/browser_sync/profile_sync_test_util.cc

 // Copyright 2016 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/browser_sync/profile_sync_test_util.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/history/core/browser/history_model_worker.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/signin/core/browser/signin_manager_base.h"
 #include "components/sync/base/sync_prefs.h"
 #include "components/sync/driver/signin_manager_wrapper.h"
 #include "components/sync/engine/browser_thread_model_worker.h"
 #include "components/sync/engine/passive_model_worker.h"
 #include "components/sync/engine/ui_model_worker.h"
 #include "net/url_request/url_request_test_util.h"
 
-using ServiceProvider = syncer::SyncClient::ServiceProvider;
-
 namespace browser_sync {
 
 namespace {
 
 class BundleSyncClient : public syncer::FakeSyncClient {
  public:
   BundleSyncClient(syncer::SyncApiComponentFactory* factory,
                    PrefService* pref_service,
                    sync_sessions::SyncSessionsClient* sync_sessions_client,
                    autofill::PersonalDataManager* personal_data_manager,
                    const base::Callback<base::WeakPtr<syncer::SyncableService>(
                        syncer::ModelType type)>& get_syncable_service_callback,
                    const base::Callback<syncer::SyncService*(void)>&
                        get_sync_service_callback,
                    const base::Callback<bookmarks::BookmarkModel*(void)>&
                        get_bookmark_model_callback,
                    scoped_refptr<base::SingleThreadTaskRunner> db_thread,
                    scoped_refptr<base::SingleThreadTaskRunner> file_thread,
                    history::HistoryService* history_service);
 
   ~BundleSyncClient() override;
 
   PrefService* GetPrefService() override;
   sync_sessions::SyncSessionsClient* GetSyncSessionsClient() override;
   autofill::PersonalDataManager* GetPersonalDataManager() override;
-  ServiceProvider GetSyncableServiceForType(syncer::ModelType type) override;
+  base::WeakPtr<syncer::SyncableService> GetSyncableServiceForType(
+      syncer::ModelType type) override;
   syncer::SyncService* GetSyncService() override;
   scoped_refptr<syncer::ModelSafeWorker> CreateModelWorkerForGroup(
       syncer::ModelSafeGroup group) override;
   history::HistoryService* GetHistoryService() override;
   bookmarks::BookmarkModel* GetBookmarkModel() override;
 
  private:
   PrefService* const pref_service_;
   sync_sessions::SyncSessionsClient* const sync_sessions_client_;
   autofill::PersonalDataManager* const personal_data_manager_;
@@ skipping 42 matching lines @@
 }
 
 sync_sessions::SyncSessionsClient* BundleSyncClient::GetSyncSessionsClient() {
   return sync_sessions_client_;
 }
 
 autofill::PersonalDataManager* BundleSyncClient::GetPersonalDataManager() {
   return personal_data_manager_;
 }
 
-ServiceProvider BundleSyncClient::GetSyncableServiceForType(
-    syncer::ModelType type) {
+base::WeakPtr<syncer::SyncableService>
+BundleSyncClient::GetSyncableServiceForType(syncer::ModelType type) {
   if (get_syncable_service_callback_.is_null())
     return syncer::FakeSyncClient::GetSyncableServiceForType(type);
-  return base::Bind(get_syncable_service_callback_, type);
+  return get_syncable_service_callback_.Run(type);
 }
 
 syncer::SyncService* BundleSyncClient::GetSyncService() {
   if (get_sync_service_callback_.is_null())
     return syncer::FakeSyncClient::GetSyncService();
   return get_sync_service_callback_.Run();
 }
 
 scoped_refptr<syncer::ModelSafeWorker>
 BundleSyncClient::CreateModelWorkerForGroup(syncer::ModelSafeGroup group) {
@@ skipping 132 matching lines @@
       base::Bind(&EmptyNetworkTimeUpdate);
   init_params.base_directory = base::FilePath(FILE_PATH_LITERAL("dummyPath"));
   init_params.url_request_context = url_request_context();
   init_params.debug_identifier = "dummyDebugName";
   init_params.channel = version_info::Channel::UNKNOWN;
 
   return init_params;
 }
 
 }  // namespace browser_sync