trunk/src/chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h - Issue 468643002: Revert 288464 "[Sync] Cleanup datatype configuration error handl..."

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: trunk/src/chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h

Issue 468643002: Revert 288464 "[Sync] Cleanup datatype configuration error handl..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 4 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: trunk/src/chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h

===================================================================

--- trunk/src/chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h (revision 289114)

+++ trunk/src/chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h (working copy)

@@ -39,11 +39,11 @@

MOCK_METHOD0(CreateSyncComponents,

ProfileSyncComponentsFactory::SyncComponents());

MOCK_METHOD3(StartDone,

- void(DataTypeController::ConfigureResult result,

+ void(DataTypeController::StartResult result,

const syncer::SyncMergeResult& local_merge_result,

const syncer::SyncMergeResult& syncer_merge_result));

MOCK_METHOD4(StartDoneImpl,

- void(DataTypeController::ConfigureResult result,

+ void(DataTypeController::StartResult result,

DataTypeController::State new_state,

const syncer::SyncMergeResult& local_merge_result,

const syncer::SyncMergeResult& syncer_merge_result));

@@ -53,7 +53,7 @@

MOCK_METHOD2(RecordUnrecoverableError, void(const tracked_objects::Location&,

const std::string&));

MOCK_METHOD1(RecordAssociationTime, void(base::TimeDelta time));

- MOCK_METHOD1(RecordStartFailure, void(ConfigureResult result));

+ MOCK_METHOD1(RecordStartFailure, void(StartResult result));

protected:

virtual ~NonFrontendDataTypeControllerMock();