chrome/browser/sync/glue/new_non_frontend_data_type_controller_mock.h - Issue 10662035: [Sync] Put everything in sync/api into csync 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/new_non_frontend_data_type_controller_mock.h

Issue 10662035: [Sync] Put everything in sync/api into csync namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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

« chrome/browser/extensions/settings/settings_sync_unittest.cc ('K') | « chrome/browser/sync/glue/new_non_frontend_data_type_controller.cc ('k') | chrome/browser/sync/glue/new_non_frontend_data_type_controller_unittest.cc » ('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_mock.h

diff --git a/chrome/browser/sync/glue/new_non_frontend_data_type_controller_mock.h b/chrome/browser/sync/glue/new_non_frontend_data_type_controller_mock.h

index c1eb2956aca50d13bd2c696e0094d9b84c7f6db4..59b7aab4a30816f6b9cabc62c6101f44f04d6dff 100644

--- a/chrome/browser/sync/glue/new_non_frontend_data_type_controller_mock.h

+++ b/chrome/browser/sync/glue/new_non_frontend_data_type_controller_mock.h

@@ -40,13 +40,13 @@ class NewNonFrontendDataTypeControllerMock

MOCK_METHOD0(StartAssociation, void());

MOCK_METHOD0(CreateSyncComponents, void());

MOCK_METHOD2(StartFailed, void(StartResult result,

- const SyncError& error));

+ const csync::SyncError& error));

MOCK_METHOD3(StartDone, void(DataTypeController::StartResult result,

DataTypeController::State new_state,

- const SyncError& error));

+ const csync::SyncError& error));

MOCK_METHOD3(StartDoneImpl, void(DataTypeController::StartResult result,

DataTypeController::State new_state,

- const SyncError& error));

+ const csync::SyncError& error));

MOCK_METHOD0(StopModels, void());

MOCK_METHOD0(StopAssociationAsync, bool());

MOCK_METHOD0(StopAssociation, void());

@@ -59,7 +59,7 @@ class NewNonFrontendDataTypeControllerMock

// NewNonFrontendDataTypeController mocks.

MOCK_CONST_METHOD0(GetWeakPtrToSyncableService,

- base::WeakPtr<SyncableService>());

+ base::WeakPtr<csync::SyncableService>());

protected:

virtual ~NewNonFrontendDataTypeControllerMock();