chrome/browser/sync/profile_sync_service_typed_url_unittest.cc - Issue 9232011: sync: Make ProfileSyncService a ProfileKeyedService.

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

Issue 9232011: sync: Make ProfileSyncService a ProfileKeyedService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: init Created 8 years, 11 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_service_factory.cc ('K') | « chrome/browser/sync/profile_sync_service_startup_unittest.cc ('k') | chrome/browser/sync/profile_sync_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/profile_sync_service_typed_url_unittest.cc

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

index d4a2b382790e9e10c59ba2bf741108313d658e13..662106bd26f6b589f6a38174e2850a9833582a24 100644

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

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

@@ -182,8 +182,10 @@ class ProfileSyncServiceTypedUrlTest : public AbstractProfileSyncServiceTest {

if (!service_.get()) {

SigninManager* signin = profile_.GetSigninManager();

signin->SetAuthenticatedUsername("test");

+ ProfileSyncComponentsFactoryMock* factory =

+ new ProfileSyncComponentsFactoryMock();

service_.reset(

- new TestProfileSyncService(&factory_,

+ new TestProfileSyncService(factory,

&profile_,

signin,

ProfileSyncService::AUTO_START,

@@ -192,15 +194,15 @@ class ProfileSyncServiceTypedUrlTest : public AbstractProfileSyncServiceTest {

EXPECT_CALL(profile_, GetProfileSyncService()).WillRepeatedly(

Return(service_.get()));

TypedUrlDataTypeController* data_type_controller =

- new TypedUrlDataTypeController(&factory_,

+ new TypedUrlDataTypeController(factory,

&profile_);

- EXPECT_CALL(factory_, CreateTypedUrlSyncComponents(_, _, _)).

+ EXPECT_CALL(*factory, CreateTypedUrlSyncComponents(_, _, _)).

WillOnce(MakeTypedUrlSyncComponents(&profile_,

service_.get(),

history_backend_.get(),

data_type_controller));

- EXPECT_CALL(factory_, CreateDataTypeManager(_, _)).

+ EXPECT_CALL(*factory, CreateDataTypeManager(_, _)).

WillOnce(ReturnNewDataTypeManager());

EXPECT_CALL(profile_, GetHistoryServiceWithoutCreating()).

@@ -297,7 +299,6 @@ class ProfileSyncServiceTypedUrlTest : public AbstractProfileSyncServiceTest {

scoped_refptr<ThreadNotificationService> notification_service_;

ProfileMock profile_;

- ProfileSyncComponentsFactoryMock factory_;

scoped_refptr<HistoryBackendMock> history_backend_;

scoped_refptr<HistoryServiceMock> history_service_;

};