diff options
| author | grunell@chromium.org <grunell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-04 11:21:10 +0000 |
|---|---|---|
| committer | grunell@chromium.org <grunell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-04 11:21:10 +0000 |
| commit | f3724cf84105af3115b3689f325f7a9948d94cd7 (patch) | |
| tree | 214833ebe215ca559ed8414183575bcdebf1ecc5 /chrome/browser/browser_process_impl.cc | |
| parent | 6857bbab378b7ae7f61399ff4af03ca2fcbe6c60 (diff) | |
| download | chromium_src-f3724cf84105af3115b3689f325f7a9948d94cd7.zip chromium_src-f3724cf84105af3115b3689f325f7a9948d94cd7.tar.gz chromium_src-f3724cf84105af3115b3689f325f7a9948d94cd7.tar.bz2 | |
Revert 253551 "Move destruction of WebRtcLogUploader to post thr..."
This caused inconsistent render crash.
BUG=348928
> Move destruction of WebRtcLogUploader to post threads teardown.
>
> Needs to outlive the file thread.
>
> Fixes rare crash.
>
> BUG=344892
>
> Review URL: https://codereview.chromium.org/174493003
TBR=grunell@chromium.org
Review URL: https://codereview.chromium.org/184223010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254744 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 727ecfe..9ecbacfb 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -285,6 +285,10 @@ void BrowserProcessImpl::StartTearDown() { platform_part()->StartTearDown(); +#if defined(ENABLE_WEBRTC) + webrtc_log_uploader_.reset(); +#endif + if (local_state()) local_state()->CommitPendingWrite(); } @@ -293,11 +297,6 @@ void BrowserProcessImpl::PostDestroyThreads() { // With the file_thread_ flushed, we can release any icon resources. icon_manager_.reset(); -#if defined(ENABLE_WEBRTC) - // Must outlive the file thread. - webrtc_log_uploader_.reset(); -#endif - // Reset associated state right after actual thread is stopped, // as io_thread_.global_ cleanup happens in CleanUp on the IO // thread, i.e. as the thread exits its message loop. |