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

components/sync/driver/shared_change_processor_unittest.cc

 // Copyright 2014 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/sync/driver/shared_change_processor.h"
 
 #include <cstddef>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 73 matching lines @@
       : FakeSyncClient(&factory_),
         model_thread_("dbthread"),
         did_connect_(false),
         has_attachment_service_(false) {}
 
   ~SyncSharedChangeProcessorTest() override {
     EXPECT_FALSE(db_syncable_service_.get());
   }
 
   // FakeSyncClient override.
-  ServiceProvider GetSyncableServiceForType(ModelType type) override {
-    return base::Bind(&SyncableService::AsWeakPtr,
-                      base::Unretained(db_syncable_service_.get()));
+  base::WeakPtr<SyncableService> GetSyncableServiceForType(
+      ModelType type) override {
+    return db_syncable_service_->AsWeakPtr();
   }
 
  protected:
   void SetUp() override {
     test_user_share_.SetUp();
     shared_change_processor_ = new SharedChangeProcessor(AUTOFILL);
     ASSERT_TRUE(model_thread_.Start());
     ASSERT_TRUE(model_thread_.task_runner()->PostTask(
         FROM_HERE,
         base::Bind(&SyncSharedChangeProcessorTest::SetUpDBSyncableService,
@@ skipping 71 matching lines @@
         AttachmentStore::CreateInMemoryStore());
   }
 
   // Used by Connect().  The SharedChangeProcessor is passed in
   // because we modify |shared_change_processor_| on the main thread
   // (in TearDown()).
   void ConnectOnDBThread(
       const scoped_refptr<SharedChangeProcessor>& shared_change_processor) {
     DCHECK(model_thread_.task_runner()->BelongsToCurrentThread());
     EXPECT_TRUE(shared_change_processor->Connect(
-        GetSyncableServiceForType(AUTOFILL), &factory_, &processor_factory_,
-        test_user_share_.user_share(),
+        this, &processor_factory_, test_user_share_.user_share(),
         base::MakeUnique<DataTypeErrorHandlerMock>(),
         base::WeakPtr<SyncMergeResult>()));
     did_connect_ = true;
   }
 
   void CheckAttachmentServiceOnDBThread(base::WaitableEvent* event) {
     DCHECK(model_thread_.task_runner()->BelongsToCurrentThread());
     DCHECK(db_syncable_service_.get());
     has_attachment_service_ = !!db_syncable_service_->attachment_service();
     event->Signal();
@@ skipping 25 matching lines @@
 // creates AttachmentService and passes it back to the syncable service.
 TEST_F(SyncSharedChangeProcessorTest, ConnectWithAttachmentStore) {
   SetAttachmentStore();
   Connect();
   EXPECT_TRUE(HasAttachmentService());
 }
 
 }  // namespace
 
 }  // namespace syncer