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

components/sync/driver/async_directory_type_controller_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/async_directory_type_controller.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 48 matching lines @@
 ACTION_P(SaveChangeProcessor, scoped_change_processor) {
   scoped_change_processor->reset(arg2);
 }
 
 class SharedChangeProcessorMock : public SharedChangeProcessor {
  public:
   explicit SharedChangeProcessorMock(ModelType type)
       : SharedChangeProcessor(type) {}
 
   base::WeakPtr<SyncableService> Connect(
-      const SyncClient::ServiceProvider&,
-      SyncApiComponentFactory* driver_factory,
+      SyncClient*,
       GenericChangeProcessorFactory*,
       UserShare*,
       std::unique_ptr<DataTypeErrorHandler>,
       const base::WeakPtr<SyncMergeResult>&) {
     return std::move(connect_return_);
   }
   MOCK_METHOD0(Disconnect, bool());
   MOCK_METHOD2(ProcessSyncChanges,
                SyncError(const tracked_objects::Location&,
                          const SyncChangeList&));
@@ skipping 393 matching lines @@
   backend_thread_.task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&DataTypeErrorHandler::OnUnrecoverableError,
                  base::Passed(non_ui_dtc_->CreateErrorHandler()), error));
   WaitForDTC();
 }
 
 }  // namespace
 
 }  // namespace syncer