chrome/browser/sync/glue/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/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:

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

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

index ac5391fd61fa33d53332b8abd6543fc1fef1cfc2..ec34e50f97ba8e8453444bbffd075836fd596ef1 100644

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

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

@@ -46,7 +46,7 @@ class FrontendDataTypeControllerFake : public FrontendDataTypeController {

profile,

sync_service),

mock_(mock) {}

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

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

private:

virtual void CreateSyncComponents() {

@@ -209,7 +209,7 @@ TEST_F(SyncFrontendDataTypeControllerTest, StartAssociationFailed) {

EXPECT_CALL(*model_associator_, AssociateModels()).

WillOnce(Return(syncer::SyncError(FROM_HERE,

"error",

- syncable::PREFERENCES)));

+ syncer::PREFERENCES)));

EXPECT_CALL(*dtc_mock_, RecordAssociationTime(_));

SetStartFailExpectations(DataTypeController::ASSOCIATION_FAILED);