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

components/sync/driver/generic_change_processor.h

 // 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.
 
 #ifndef COMPONENTS_SYNC_DRIVER_GENERIC_CHANGE_PROCESSOR_H_
 #define COMPONENTS_SYNC_DRIVER_GENERIC_CHANGE_PROCESSOR_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/sequence_checker.h"
 #include "components/sync/model/attachments/attachment_service.h"
 #include "components/sync/model/attachments/attachment_service_proxy.h"
 #include "components/sync/model/attachments/attachment_store.h"
 #include "components/sync/model/change_processor.h"
 #include "components/sync/model/data_type_error_handler.h"
 #include "components/sync/model/sync_change_processor.h"
 #include "components/sync/model/sync_merge_result.h"
 
 namespace syncer {
 
-class SyncApiComponentFactory;
+class SyncClient;
 class SyncData;
 class SyncableService;
 class WriteNode;
 class WriteTransaction;
 
 namespace syncable {
 class Entry;
 }  // namespace syncable
 
 using SyncDataList = std::vector<SyncData>;
@@ skipping 12 matching lines @@
  public:
   // Create a change processor for |type| and connect it to the syncer.
   // |attachment_store| can be null which means that datatype will not use sync
   // attachments.
   GenericChangeProcessor(
       ModelType type,
       std::unique_ptr<DataTypeErrorHandler> error_handler,
       const base::WeakPtr<SyncableService>& local_service,
       const base::WeakPtr<SyncMergeResult>& merge_result,
       UserShare* user_share,
-      SyncApiComponentFactory* driver_factory,
+      SyncClient* sync_client,
       std::unique_ptr<AttachmentStoreForSync> attachment_store);
   ~GenericChangeProcessor() override;
 
   // ChangeProcessor interface.
   // Build and store a list of all changes into |syncer_changes_|.
   void ApplyChangesFromSyncModel(
       const BaseTransaction* trans,
       int64_t version,
       const ImmutableChangeRecordList& changes) override;
   // Passes |syncer_changes_|, built in ApplyChangesFromSyncModel, onto
@@ skipping 114 matching lines @@
       attachment_service_weak_ptr_factory_;
   AttachmentServiceProxy attachment_service_proxy_;
   base::WeakPtrFactory<GenericChangeProcessor> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GenericChangeProcessor);
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_DRIVER_GENERIC_CHANGE_PROCESSOR_H_