Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1031)

Unified Diff: components/sync_driver/generic_change_processor.cc

Issue 1310553005: [Sync] Replace ProfileSyncComponentsFactory with SyncClient (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Really fix GN Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/sync_driver/generic_change_processor.cc
diff --git a/components/sync_driver/generic_change_processor.cc b/components/sync_driver/generic_change_processor.cc
index ab390be2a6f8b8a03a24040fcff1126320bd1336..21fb9ce1f4f0b0f91df2e08d29a78141a9d5b7d9 100644
--- a/components/sync_driver/generic_change_processor.cc
+++ b/components/sync_driver/generic_change_processor.cc
@@ -9,6 +9,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/thread_task_runner_handle.h"
#include "components/sync_driver/sync_api_component_factory.h"
+#include "components/sync_driver/sync_client.h"
#include "sync/api/sync_change.h"
#include "sync/api/sync_error.h"
#include "sync/api/syncable_service.h"
@@ -94,7 +95,7 @@ GenericChangeProcessor::GenericChangeProcessor(
const base::WeakPtr<syncer::SyncableService>& local_service,
const base::WeakPtr<syncer::SyncMergeResult>& merge_result,
syncer::UserShare* user_share,
- SyncApiComponentFactory* sync_factory,
+ SyncClient* sync_client,
scoped_ptr<syncer::AttachmentStoreForSync> attachment_store)
: ChangeProcessor(error_handler),
type_(type),
@@ -110,8 +111,9 @@ GenericChangeProcessor::GenericChangeProcessor(
syncer::ReadTransaction trans(FROM_HERE, share_handle());
store_birthday = trans.GetStoreBirthday();
}
- attachment_service_ = sync_factory->CreateAttachmentService(
- attachment_store.Pass(), *user_share, store_birthday, type, this);
+ attachment_service_ =
+ sync_client->GetSyncApiComponentFactory()->CreateAttachmentService(
+ attachment_store.Pass(), *user_share, store_birthday, type, this);
attachment_service_weak_ptr_factory_.reset(
new base::WeakPtrFactory<syncer::AttachmentService>(
attachment_service_.get()));
« no previous file with comments | « components/sync_driver/generic_change_processor.h ('k') | components/sync_driver/generic_change_processor_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698