diff options
author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-08 23:15:57 +0000 |
---|---|---|
committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-08 23:17:18 +0000 |
commit | 93630da53e4e5593dcbb3e59103d42da036a42b1 (patch) | |
tree | e439dac92e9c081d2393ca8c84d5901df0c86ed1 /components/sync_driver/non_ui_data_type_controller_mock.h | |
parent | f828655e44f15d96387e3b6f341a1e55d41091cc (diff) | |
download | chromium_src-93630da53e4e5593dcbb3e59103d42da036a42b1.zip chromium_src-93630da53e4e5593dcbb3e59103d42da036a42b1.tar.gz chromium_src-93630da53e4e5593dcbb3e59103d42da036a42b1.tar.bz2 |
[Sync] Cleanup datatype configuration error handling.
The FailedDataTypeHandler is now informed immediately of failures, including
datatype errors, and is therefore authoritative source for all errors. As such,
partial success is no longer tracked and the various ModelTypeSets for error
types in configure results are removed.
BUG=368834
Review URL: https://codereview.chromium.org/420633002
Cr-Commit-Position: refs/heads/master@{#288464}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288464 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/sync_driver/non_ui_data_type_controller_mock.h')
-rw-r--r-- | components/sync_driver/non_ui_data_type_controller_mock.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/sync_driver/non_ui_data_type_controller_mock.h b/components/sync_driver/non_ui_data_type_controller_mock.h index 68f889f..1369c33 100644 --- a/components/sync_driver/non_ui_data_type_controller_mock.h +++ b/components/sync_driver/non_ui_data_type_controller_mock.h @@ -37,16 +37,16 @@ class NonUIDataTypeControllerMock bool(const tracked_objects::Location&, const base::Closure&)); 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)); MOCK_METHOD1(RecordAssociationTime, void(base::TimeDelta time)); - MOCK_METHOD1(RecordStartFailure, void(StartResult result)); + MOCK_METHOD1(RecordStartFailure, void(ConfigureResult result)); protected: virtual ~NonUIDataTypeControllerMock(); |