Index: content/browser/browser_main_loop.cc |
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc |
index 8a9a37de8ab6eec4c2bd228c0283ea38fdf180c8..c93d24bb6267dc34e1c19d4aaa9170d07066c36d 100644 |
--- a/content/browser/browser_main_loop.cc |
+++ b/content/browser/browser_main_loop.cc |
@@ -689,8 +689,8 @@ int BrowserMainLoop::PreCreateThreads() { |
#endif |
#if defined(ENABLE_PLUGINS) |
- // Prior to any processing happening on the io thread, we create the |
- // plugin service as it is predominantly used from the io thread, |
+ // Prior to any processing happening on the IO thread, we create the |
+ // plugin service as it is predominantly used from the IO thread, |
// but must be created on the main thread. The service ctor is |
kinuko
2015/10/05 08:56:32
(are these changes related?)
Takashi Toyoshima
2015/10/05 16:11:05
Yeah, I just want to make the term consistent with
|
// inexpensive and does not invoke the io_thread() accessor. |
{ |
@@ -960,7 +960,12 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() { |
if (resource_dispatcher_host_) { |
TRACE_EVENT0("shutdown", |
"BrowserMainLoop::Subsystem:ResourceDispatcherHost"); |
- resource_dispatcher_host_.get()->Shutdown(); |
+ resource_dispatcher_host_->Shutdown(); |
+ } |
+ // Request shutdown to clean up allocated resources on the IO thread. |
Takashi Toyoshima
2015/10/05 16:11:05
I noticed that when I wrote this comment.
|
+ if (midi_manager_) { |
+ TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:MidiManager"); |
+ midi_manager_->Shutdown(); |
} |
memory_pressure_monitor_.reset(); |