chrome/browser/sync/profile_sync_components_factory_mock.cc - Issue 1310553005: [Sync] Replace ProfileSyncComponentsFactory with SyncClient

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync/profile_sync_components_factory_mock.cc

Issue 1310553005: [Sync] Replace ProfileSyncComponentsFactory with SyncClient (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Self review 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

« chrome/browser/sync/profile_sync_components_factory_impl.cc ('K') | « chrome/browser/sync/profile_sync_components_factory_mock.h ('k') | chrome/browser/sync/profile_sync_service.h » ('j') | chrome/browser/sync/profile_sync_service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/profile_sync_components_factory_mock.cc

diff --git a/chrome/browser/sync/profile_sync_components_factory_mock.cc b/chrome/browser/sync/profile_sync_components_factory_mock.cc

index 30f57a02bc40e267b14243d3b6432255af87156b..ade594c25cb07fc8df924b783a9abf8b1bf7e3e4 100644

--- a/chrome/browser/sync/profile_sync_components_factory_mock.cc

+++ b/chrome/browser/sync/profile_sync_components_factory_mock.cc

@@ -7,7 +7,6 @@

#include "components/sync_driver/change_processor.h"

#include "components/sync_driver/local_device_info_provider_mock.h"

#include "components/sync_driver/model_associator.h"

-#include "content/public/browser/browser_thread.h"

#include "sync/api/attachments/attachment_store.h"

#include "sync/internal_api/public/attachments/attachment_service_impl.h"

@@ -45,10 +44,10 @@ ProfileSyncComponentsFactoryMock::CreateAttachmentService(

return syncer::AttachmentServiceImpl::CreateForTest();

}

-ProfileSyncComponentsFactory::SyncComponents

+sync_driver::SyncApiComponentFactory::SyncComponents

ProfileSyncComponentsFactoryMock::MakeSyncComponents() {

- return SyncComponents(model_associator_.release(),

- change_processor_.release());

+ return sync_driver::SyncApiComponentFactory::SyncComponents(

+ model_associator_.release(), change_processor_.release());

}

scoped_ptr<sync_driver::LocalDeviceInfoProvider>