chrome/browser/sync/glue/new_non_frontend_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/new_non_frontend_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/new_non_frontend_data_type_controller.cc ('k') | chrome/browser/sync/glue/non_frontend_data_type_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 701aaa365a8f2cd22e5ceb3e33f212b28fc57905..235de898960237c806f8cf743712004cc4882490 100644

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

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

@@ -17,7 +17,7 @@

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

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

#include "chrome/browser/sync/glue/shared_change_processor_mock.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"

@@ -66,7 +66,7 @@ class NewNonFrontendDataTypeControllerFake

: public NewNonFrontendDataTypeController {

public:

NewNonFrontendDataTypeControllerFake(

- ProfileSyncFactory* profile_sync_factory,

+ ProfileSyncComponentsFactory* profile_sync_factory,

Profile* profile,

NewNonFrontendDataTypeControllerMock* mock)

: NewNonFrontendDataTypeController(profile_sync_factory,

@@ -134,7 +134,7 @@ class NewNonFrontendDataTypeControllerTest : public testing::Test {

EXPECT_CALL(service_, GetUserShare()).WillRepeatedly(

Return((sync_api::UserShare*)NULL));

db_thread_.Start();

- profile_sync_factory_.reset(new ProfileSyncFactoryMock());

+ profile_sync_factory_.reset(new ProfileSyncComponentsFactoryMock());

change_processor_ = new SharedChangeProcessorMock();

// Both of these are refcounted, so don't need to be released.

@@ -217,7 +217,7 @@ class NewNonFrontendDataTypeControllerTest : public testing::Test {

content::TestBrowserThread ui_thread_;

content::TestBrowserThread db_thread_;

ProfileMock profile_;

- scoped_ptr<ProfileSyncFactoryMock> profile_sync_factory_;

+ scoped_ptr<ProfileSyncComponentsFactoryMock> profile_sync_factory_;

ProfileSyncServiceMock service_;

StartCallback start_callback_;

// Must be destroyed after new_non_frontend_dtc_.