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

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

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

index a1a1d11be07c53ee6857b2ea9fcf74ef4ae01c02..b4e6174020761710210008404d0fa7d3ca501d4e 100644

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

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

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

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

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

#include "chrome/browser/sync/glue/model_associator_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/common/chrome_notification_types.h"

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

@@ -37,7 +37,7 @@ class TestAppNotificationDataTypeController

: public AppNotificationDataTypeController {

public:

TestAppNotificationDataTypeController(

- ProfileSyncFactory* profile_sync_factory,

+ ProfileSyncComponentsFactory* profile_sync_factory,

Profile* profile,

ProfileSyncService* sync_service)

: AppNotificationDataTypeController(profile_sync_factory,

@@ -69,7 +69,7 @@ class AppNotificationDataTypeControllerTest

profile_.reset(new TestingProfile());

model_associator_ = new ModelAssociatorMock();

change_processor_ = new ChangeProcessorMock();

- profile_sync_factory_.reset(new ProfileSyncFactoryMock(

+ profile_sync_factory_.reset(new ProfileSyncComponentsFactoryMock(

model_associator_, change_processor_));

app_notif_dtc_ = new TestAppNotificationDataTypeController(

profile_sync_factory_.get(),

@@ -131,7 +131,7 @@ class AppNotificationDataTypeControllerTest

content::TestBrowserThread file_thread_;

scoped_ptr<TestingProfile> profile_;

scoped_refptr<TestAppNotificationDataTypeController> app_notif_dtc_;

- scoped_ptr<ProfileSyncFactoryMock> profile_sync_factory_;

+ scoped_ptr<ProfileSyncComponentsFactoryMock> profile_sync_factory_;

ProfileSyncServiceMock service_;

ModelAssociatorMock* model_associator_;

ChangeProcessorMock* change_processor_;