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

components/sync/driver/generic_change_processor.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/generic_change_processor.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <utility>
 
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "components/sync/base/unrecoverable_error_handler.h"
 #include "components/sync/driver/sync_api_component_factory.h"
+#include "components/sync/driver/sync_client.h"
 #include "components/sync/model/local_change_observer.h"
 #include "components/sync/model/sync_change.h"
 #include "components/sync/model/sync_error.h"
 #include "components/sync/model/syncable_service.h"
 #include "components/sync/syncable/base_node.h"
 #include "components/sync/syncable/change_record.h"
 #include "components/sync/syncable/entry.h"  // TODO(tim): Bug 123674.
 #include "components/sync/syncable/read_node.h"
 #include "components/sync/syncable/read_transaction.h"
 #include "components/sync/syncable/write_node.h"
@@ skipping 74 matching lines @@
 }
 
 }  // namespace
 
 GenericChangeProcessor::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)
     : ChangeProcessor(std::move(error_handler)),
       type_(type),
       local_service_(local_service),
       merge_result_(merge_result),
       share_handle_(user_share),
       weak_ptr_factory_(this) {
   DCHECK(sequence_checker_.CalledOnValidSequence());
   DCHECK_NE(type_, UNSPECIFIED);
   if (attachment_store) {
     std::string store_birthday;
     {
       ReadTransaction trans(FROM_HERE, share_handle());
       store_birthday = trans.GetStoreBirthday();
     }
-    attachment_service_ = driver_factory->CreateAttachmentService(
-        std::move(attachment_store), *user_share, store_birthday, type, this);
+    attachment_service_ =
+        sync_client->GetSyncApiComponentFactory()->CreateAttachmentService(
+            std::move(attachment_store), *user_share, store_birthday, type,
+            this);
     attachment_service_weak_ptr_factory_ =
         base::MakeUnique<base::WeakPtrFactory<AttachmentService>>(
             attachment_service_.get());
     attachment_service_proxy_ = AttachmentServiceProxy(
         base::SequencedTaskRunnerHandle::Get(),
         attachment_service_weak_ptr_factory_->GetWeakPtr());
     UploadAllAttachmentsNotOnServer();
   } else {
     attachment_service_proxy_ =
         AttachmentServiceProxy(base::SequencedTaskRunnerHandle::Get(),
@@ skipping 555 matching lines @@
     observer.OnLocalChange(current_entry, change);
 }
 
 std::unique_ptr<AttachmentService>
 GenericChangeProcessor::GetAttachmentService() const {
   return std::unique_ptr<AttachmentService>(
       new AttachmentServiceProxy(attachment_service_proxy_));
 }
 
 }  // namespace syncer