chrome/browser/sync/glue/preference_data_type_controller_unittest.cc - Issue 8596017: sync: rename ProfileSyncFactory to ProfileSyncComponentsFactory.

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/glue/preference_data_type_controller_unittest.cc

Issue 8596017: sync: rename ProfileSyncFactory to ProfileSyncComponentsFactory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: final Created 9 years, 1 month 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/preference_data_type_controller.cc ('k') | chrome/browser/sync/glue/search_engine_data_type_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/glue/preference_data_type_controller_unittest.cc

diff --git a/chrome/browser/sync/glue/preference_data_type_controller_unittest.cc b/chrome/browser/sync/glue/preference_data_type_controller_unittest.cc

index f3c95496b6f6e5e6a9b706a41f7ae39b353defd0..732b096c3058cd71195afafcf6c06b612e48499e 100644

--- a/chrome/browser/sync/glue/preference_data_type_controller_unittest.cc

+++ b/chrome/browser/sync/glue/preference_data_type_controller_unittest.cc

@@ -13,7 +13,7 @@

#include "chrome/browser/sync/glue/data_type_controller_mock.h"

#include "chrome/browser/sync/glue/model_associator_mock.h"

#include "chrome/browser/sync/glue/preference_data_type_controller.h"

-#include "chrome/browser/sync/profile_sync_factory_mock.h"

+#include "chrome/browser/sync/profile_sync_components_factory_mock.h"

#include "chrome/browser/sync/profile_sync_service_mock.h"

#include "chrome/test/base/profile_mock.h"

#include "content/test/test_browser_thread.h"

@@ -36,7 +36,7 @@ class PreferenceDataTypeControllerTest : public testing::Test {

: ui_thread_(BrowserThread::UI, &message_loop_) {}

virtual void SetUp() {

- profile_sync_factory_.reset(new ProfileSyncFactoryMock());

+ profile_sync_factory_.reset(new ProfileSyncComponentsFactoryMock());

preference_dtc_ =

new PreferenceDataTypeController(profile_sync_factory_.get(),

&profile_,

@@ -49,7 +49,7 @@ class PreferenceDataTypeControllerTest : public testing::Test {

change_processor_ = new ChangeProcessorMock();

EXPECT_CALL(*profile_sync_factory_, CreatePreferenceSyncComponents(_, _)).

WillOnce(Return(

- ProfileSyncFactory::SyncComponents(model_associator_,

+ ProfileSyncComponentsFactory::SyncComponents(model_associator_,

change_processor_)));

}

@@ -78,7 +78,7 @@ class PreferenceDataTypeControllerTest : public testing::Test {

MessageLoopForUI message_loop_;

content::TestBrowserThread ui_thread_;

scoped_refptr<PreferenceDataTypeController> preference_dtc_;

- scoped_ptr<ProfileSyncFactoryMock> profile_sync_factory_;

+ scoped_ptr<ProfileSyncComponentsFactoryMock> profile_sync_factory_;

ProfileMock profile_;

ProfileSyncServiceMock service_;

ModelAssociatorMock* model_associator_;