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

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

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

index 39c21dd28ff9d2d17c23a135b721e2c149c0f9d6..7f0a37de7c867ce33d232de22d1dd3064ea49ca8 100644

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

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

@@ -61,7 +61,7 @@ class NonFrontendDataTypeControllerFake : public NonFrontendDataTypeController {

sync_service),

mock_(mock) {}

- virtual syncable::ModelType type() const { return syncable::BOOKMARKS; }

+ virtual syncer::ModelType type() const { return syncer::BOOKMARKS; }

virtual syncer::ModelSafeGroup model_safe_group() const {

return syncer::GROUP_DB;

}

@@ -250,7 +250,7 @@ TEST_F(SyncNonFrontendDataTypeControllerTest, StartAssociationFailed) {

WillOnce(DoAll(SetArgumentPointee<0>(true), Return(true)));

EXPECT_CALL(*model_associator_, AssociateModels()).

WillOnce(

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

+ Return(syncer::SyncError(FROM_HERE, "Error", syncer::AUTOFILL)));

EXPECT_CALL(*dtc_mock_, RecordAssociationTime(_));

SetStartFailExpectations(DataTypeController::ASSOCIATION_FAILED);

// Set up association to fail with an association failed error.