chrome/browser/sync/glue/search_engine_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/search_engine_data_type_controller_unittest.cc

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

Patch Set: rebase 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

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

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

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

index 15e1534b9aba9e139510ca880d65740b0673cbbb..f744e279fbeefef86c97e9342e8722854c68f312 100644

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

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

@@ -12,7 +12,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/search_engine_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/common/chrome_notification_types.h"

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

@@ -39,7 +39,7 @@ class SearchEngineDataTypeControllerTest : public testing::Test {

model_associator_ = new ModelAssociatorMock();

change_processor_ = new ChangeProcessorMock();

profile_sync_factory_.reset(

- new ProfileSyncFactoryMock(model_associator_,

+ new ProfileSyncComponentsFactoryMock(model_associator_,

change_processor_));

// Feed the DTC test_util_'s profile so it is reused later.

// This allows us to control the associated TemplateURLService.

@@ -80,7 +80,7 @@ class SearchEngineDataTypeControllerTest : public testing::Test {

// matters - we could leak if this is declared below.

TemplateURLServiceTestUtil test_util_;

scoped_refptr<SearchEngineDataTypeController> search_engine_dtc_;

- scoped_ptr<ProfileSyncFactoryMock> profile_sync_factory_;

+ scoped_ptr<ProfileSyncComponentsFactoryMock> profile_sync_factory_;

ProfileSyncServiceMock service_;

ModelAssociatorMock* model_associator_;

ChangeProcessorMock* change_processor_;