Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(196)

Unified Diff: chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h

Issue 420633002: [Sync] Cleanup datatype configuration error handling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compile 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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h
diff --git a/chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h b/chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h
index ddf914c35e9b0c6223a3ad5849f51b51da1af0b6..d49eee5be5b7a68809c5ccb74ea195c03de982da 100644
--- a/chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h
+++ b/chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h
@@ -39,11 +39,11 @@ class NonFrontendDataTypeControllerMock : public NonFrontendDataTypeController {
MOCK_METHOD0(CreateSyncComponents,
ProfileSyncComponentsFactory::SyncComponents());
MOCK_METHOD3(StartDone,
- void(DataTypeController::StartResult result,
+ void(DataTypeController::ConfigureResult result,
const syncer::SyncMergeResult& local_merge_result,
const syncer::SyncMergeResult& syncer_merge_result));
MOCK_METHOD4(StartDoneImpl,
- void(DataTypeController::StartResult result,
+ void(DataTypeController::ConfigureResult result,
DataTypeController::State new_state,
const syncer::SyncMergeResult& local_merge_result,
const syncer::SyncMergeResult& syncer_merge_result));
@@ -53,7 +53,7 @@ class NonFrontendDataTypeControllerMock : public NonFrontendDataTypeController {
MOCK_METHOD2(RecordUnrecoverableError, void(const tracked_objects::Location&,
const std::string&));
MOCK_METHOD1(RecordAssociationTime, void(base::TimeDelta time));
- MOCK_METHOD1(RecordStartFailure, void(StartResult result));
+ MOCK_METHOD1(RecordStartFailure, void(ConfigureResult result));
protected:
virtual ~NonFrontendDataTypeControllerMock();

Powered by Google App Engine
This is Rietveld 408576698