diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-08 23:40:06 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-08 23:40:06 +0000 |
| commit | f6ec8b2db8c6fcaa2466b6294d49260538ca00a4 (patch) | |
| tree | 839cc2c9f268d67cb34743b753771b3b9114ed5e /chrome/browser/sync/profile_sync_service_mock.h | |
| parent | 1b9c01fef349b0721f65248ae9f762e47218af95 (diff) | |
| download | chromium_src-f6ec8b2db8c6fcaa2466b6294d49260538ca00a4.zip chromium_src-f6ec8b2db8c6fcaa2466b6294d49260538ca00a4.tar.gz chromium_src-f6ec8b2db8c6fcaa2466b6294d49260538ca00a4.tar.bz2 | |
sync: Add location info to unrecoverable errors, and remove the UnrecoverableErrorHandler from model associators since it's illegal to use from there anyway.
BUG=42695
TEST=data type controller unittests
Review URL: http://codereview.chromium.org/2002012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49215 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/profile_sync_service_mock.h')
| -rw-r--r-- | chrome/browser/sync/profile_sync_service_mock.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/sync/profile_sync_service_mock.h b/chrome/browser/sync/profile_sync_service_mock.h index 539c275..75fa615 100644 --- a/chrome/browser/sync/profile_sync_service_mock.h +++ b/chrome/browser/sync/profile_sync_service_mock.h @@ -31,7 +31,9 @@ class ProfileSyncServiceMock : public ProfileSyncService { MOCK_METHOD0(OnUserAcceptedMergeAndSync, void()); MOCK_METHOD0(OnUserCancelledDialog, void()); MOCK_CONST_METHOD0(GetAuthenticatedUsername, string16()); - MOCK_METHOD0(OnUnrecoverableError, void()); + MOCK_METHOD2(OnUnrecoverableError, + void(const tracked_objects::Location& location, + const std::string& message)); MOCK_METHOD2(ActivateDataType, void(browser_sync::DataTypeController* data_type_controller, browser_sync::ChangeProcessor* change_processor)); |