Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(46)

Unified Diff: chrome/browser/browser_process_impl.cc

Issue 174493003: Move destruction of WebRtcLogUploader to post threads teardown. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_process_impl.cc
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 9ecbacfbcd9b1e7367a7594da86e9df6e1fa3ebe..727ecfe20feb26a71b4df5f777510088bbbfc34d 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -285,10 +285,6 @@ void BrowserProcessImpl::StartTearDown() {
platform_part()->StartTearDown();
-#if defined(ENABLE_WEBRTC)
- webrtc_log_uploader_.reset();
-#endif
-
if (local_state())
local_state()->CommitPendingWrite();
}
@@ -297,6 +293,11 @@ 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.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698