diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-12 23:29:10 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-12 23:31:52 +0000 |
| commit | f5de7a00d48ef86eeb126652d9f68ac00ac6db23 (patch) | |
| tree | e46b13ae2e4c8ea820091cef6e3b5523f21047a8 /components/sync_driver/non_ui_data_type_controller_mock.h | |
| parent | 209d521c49a8cae194ea5f1458a2ecbbba2bcc78 (diff) | |
| download | chromium_src-f5de7a00d48ef86eeb126652d9f68ac00ac6db23.zip chromium_src-f5de7a00d48ef86eeb126652d9f68ac00ac6db23.tar.gz chromium_src-f5de7a00d48ef86eeb126652d9f68ac00ac6db23.tar.bz2 | |
Revert 288557 "[Sync] Use OnSingleDataTypeUnrecoverableError for..."
Reason for revert: see crbug.com/403098
> [Sync] Use OnSingleDataTypeUnrecoverableError for all errors
>
> This removes the disable callback from all datatype controllers as well
> as the DisableDataType method from the PSS, in favor of
> OnSingleDataTypeUnrecoverable error (which now accepts a SyncError).
>
> BUG=368834,403098
> TBR=bauerb@chromium.org
>
> Review URL: https://codereview.chromium.org/436733002
TBR=zea@chromium.org
Review URL: https://codereview.chromium.org/465113002
Cr-Commit-Position: refs/heads/master@{#289113}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289113 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 | 5 |
1 files changed, 3 insertions, 2 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 3716a35..1369c33 100644 --- a/components/sync_driver/non_ui_data_type_controller_mock.h +++ b/components/sync_driver/non_ui_data_type_controller_mock.h @@ -26,8 +26,9 @@ class NonUIDataTypeControllerMock MOCK_CONST_METHOD0(name, std::string()); MOCK_CONST_METHOD0(model_safe_group, syncer::ModelSafeGroup()); MOCK_CONST_METHOD0(state, State()); - MOCK_METHOD1(OnSingleDataTypeUnrecoverableError, - void(const syncer::SyncError& error)); + MOCK_METHOD2(OnSingleDataTypeUnrecoverableError, + void(const tracked_objects::Location&, + const std::string&)); // NonUIDataTypeController mocks. MOCK_METHOD0(StartModels, bool()); |