diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-12 23:26:19 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-12 23:27:53 +0000 |
| commit | ae38762ca526a5ea8783a8c9ec263a3050dded20 (patch) | |
| tree | f37d3fa186b23762284e36fbbc226ce3b52ec7b3 /components/sync_driver/ui_data_type_controller.cc | |
| parent | cb618bea7e766a084a8b9a431425330b9f0c155f (diff) | |
| download | chromium_src-ae38762ca526a5ea8783a8c9ec263a3050dded20.zip chromium_src-ae38762ca526a5ea8783a8c9ec263a3050dded20.tar.gz chromium_src-ae38762ca526a5ea8783a8c9ec263a3050dded20.tar.bz2 | |
Revert 288954 "[Sync] Don't synchronously stop datatypes that en..."
Reason for revert: see crbug.com/403098
> [Sync] Don't synchronously stop datatypes that encounter errors
>
> The datatype logic may be operating unders assumptions that break when
> the type is stopped from under it, possibly triggering crashes.
>
> BUG=402595,403098
>
> Review URL: https://codereview.chromium.org/462863002
TBR=zea@chromium.org
Review URL: https://codereview.chromium.org/467923002
Cr-Commit-Position: refs/heads/master@{#289111}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289111 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/sync_driver/ui_data_type_controller.cc')
| -rw-r--r-- | components/sync_driver/ui_data_type_controller.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/components/sync_driver/ui_data_type_controller.cc b/components/sync_driver/ui_data_type_controller.cc index 23487a2..eca5779 100644 --- a/components/sync_driver/ui_data_type_controller.cc +++ b/components/sync_driver/ui_data_type_controller.cc @@ -331,12 +331,9 @@ void UIDataTypeController::OnSingleDataTypeUnrecoverableError( if (!start_callback_.is_null()) { syncer::SyncMergeResult local_merge_result(type()); local_merge_result.set_error(error); - base::MessageLoop::current()->PostTask( - FROM_HERE, - base::Bind(start_callback_, - RUNTIME_ERROR, - local_merge_result, - syncer::SyncMergeResult(type()))); + start_callback_.Run(RUNTIME_ERROR, + local_merge_result, + syncer::SyncMergeResult(type())); } } |