chrome/browser/sync/profile_sync_components_factory_impl.cc - Issue 12494020: Remove knowledge of Chrome-specific SyncableService classes from WebDataService.

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_impl.cc

Issue 12494020: Remove knowledge of Chrome-specific SyncableService classes from WebDataService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix unit test in debug mode. Created 7 years, 9 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

« no previous file with comments | « chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc ('k') | chrome/browser/sync/profile_sync_service_autofill_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/profile_sync_components_factory_impl.cc

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

index dc447fc72d89a3efbba106010c306f8f35cd1823..9eaa3c9b21ef13a37e88dbf003f0592ec8b597fd 100644

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

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

@@ -304,10 +304,11 @@ base::WeakPtr<syncer::SyncableService> ProfileSyncComponentsFactoryImpl::

if (!web_data_service_.get())

return base::WeakPtr<syncer::SyncableService>();

if (type == syncer::AUTOFILL) {

- return web_data_service_->GetAutocompleteSyncableService()->AsWeakPtr();

+ return AutocompleteSyncableService::FromWebDataService(

+ web_data_service_)->AsWeakPtr();

} else {

- return web_data_service_->

- GetAutofillProfileSyncableService()->AsWeakPtr();

+ return AutofillProfileSyncableService::FromWebDataService(

+ web_data_service_)->AsWeakPtr();

}

case syncer::APPS: