chrome/browser/sync/glue/app_notification_data_type_controller_unittest.cc - Issue 10696087: [Sync] Move ModelType and related classes to 'syncer' namespace

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 10696087: [Sync] Move ModelType and related classes to 'syncer' namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: sort headers, update copyrights Created 8 years, 6 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

« 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 30e4ee00a5d8ecabda2fc9a51513001cb233fb34..1db82963819bbacd7812b8639e59f29ba6889c41 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

@@ -86,7 +86,7 @@ class SyncAppNotificationDataTypeControllerTest

virtual void TearDown() {

// Must be done before we pump the loop.

- syncable_service_.StopSyncing(syncable::APP_NOTIFICATIONS);

+ syncable_service_.StopSyncing(syncer::APP_NOTIFICATIONS);

app_notif_dtc_ = NULL;

PumpLoop();

}

@@ -121,7 +121,7 @@ class SyncAppNotificationDataTypeControllerTest

EXPECT_CALL(model_load_callback_, Run(_, _));

// Ownership gets passed to caller of CreateGenericChangeProcessor.

EXPECT_CALL(*profile_sync_factory_,

- GetSyncableServiceForType(syncable::APP_NOTIFICATIONS)).

+ GetSyncableServiceForType(syncer::APP_NOTIFICATIONS)).

WillOnce(Return(syncable_service_.AsWeakPtr()));

EXPECT_CALL(*profile_sync_factory_, CreateSharedChangeProcessor()).

WillOnce(MakeSharedChangeProcessor());

@@ -218,7 +218,7 @@ TEST_F(SyncAppNotificationDataTypeControllerTest, StartAssociationFailed) {

EXPECT_CALL(start_callback_,

Run(DataTypeController::ASSOCIATION_FAILED, _));

syncable_service_.set_merge_data_and_start_syncing_error(

- syncer::SyncError(FROM_HERE, "Error", syncable::APP_NOTIFICATIONS));

+ syncer::SyncError(FROM_HERE, "Error", syncer::APP_NOTIFICATIONS));

Start();

EXPECT_EQ(DataTypeController::DISABLED, app_notif_dtc_->state());