| Index: content/browser/browser_main_loop.cc
|
| diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
|
| index cfda90f4d838d743de7c0d2c872469b198f3c48a..2dd4d271957a1407d0d15d9c9c96e47aa176316d 100644
|
| --- a/content/browser/browser_main_loop.cc
|
| +++ b/content/browser/browser_main_loop.cc
|
| @@ -63,7 +63,6 @@
|
| #include "content/browser/download/download_resource_handler.h"
|
| #include "content/browser/download/save_file_manager.h"
|
| #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
|
| -#include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
|
| #include "content/browser/gpu/compositor_util.h"
|
| #include "content/browser/gpu/gpu_data_manager_impl.h"
|
| #include "content/browser/gpu/gpu_process_host.h"
|
| @@ -1229,10 +1228,6 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() {
|
| device_monitor_mac_.reset();
|
| #endif
|
|
|
| - if (BrowserGpuChannelHostFactory::instance()) {
|
| - BrowserGpuChannelHostFactory::instance()->CloseChannel();
|
| - }
|
| -
|
| // Shutdown the Service Manager and IPC.
|
| service_manager_context_.reset();
|
| mojo_ipc_support_.reset();
|
| @@ -1474,12 +1469,6 @@ int BrowserMainLoop::BrowserThreadsStarted() {
|
| }
|
| #endif
|
|
|
| - // Enable the GpuMemoryBuffer dump provider with IO thread affinity. Note that
|
| - // unregistration happens on the IO thread (See
|
| - // BrowserProcessSubThread::IOThreadPreCleanUp).
|
| - base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
|
| - BrowserGpuMemoryBufferManager::current(), "BrowserGpuMemoryBufferManager",
|
| - io_thread_->task_runner());
|
| #if defined(OS_ANDROID)
|
| base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
|
| tracing::GraphicsMemoryDumpProvider::GetInstance(), "AndroidGraphics",
|
|
|