Chromium Code Reviews| 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..305eff68211e4c264c6793042af339cb128501f0 100644 |
| --- a/content/browser/browser_main_loop.cc |
| +++ b/content/browser/browser_main_loop.cc |
| @@ -87,6 +87,7 @@ |
| #if defined(OS_ANDROID) |
| #include "base/android/jni_android.h" |
| +#include "components/tracing/graphics_memory_dump_provider_android.h" |
| #include "content/browser/android/browser_startup_controller.h" |
| #include "content/browser/android/browser_surface_texture_manager.h" |
| #include "content/browser/android/in_process_surface_texture_manager.h" |
| @@ -1141,7 +1142,6 @@ int BrowserMainLoop::BrowserThreadsStarted() { |
| #if !defined(OS_IOS) |
| HistogramSynchronizer::GetInstance(); |
| - |
| #if defined(OS_ANDROID) |
| // Up the priority of the UI thread. |
| base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY); |
| @@ -1173,6 +1173,10 @@ int BrowserMainLoop::BrowserThreadsStarted() { |
| // BrowserProcessSubThread::IOThreadPreCleanUp). |
| base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( |
| BrowserGpuMemoryBufferManager::current(), io_thread_->task_runner()); |
| +#if defined(OS_ANDROID) |
| + base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( |
|
ericrk
2015/10/02 18:30:11
Do we need to register this in both Browser and GP
Primiano Tucci (use gerrit)
2015/10/05 14:24:25
In the standard (non-in-proc) case I see that both
ericrk
2015/10/05 20:32:21
That's what I was thinking, but now that I think o
|
| + tracing::GraphicsMemoryDumpProvider::GetInstance()); |
| +#endif |
| { |
| TRACE_EVENT0("startup", "BrowserThreadsStarted::Subsystem:AudioMan"); |