| Index: content/browser/browser_main_loop.cc
|
| diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
|
| index 4b95ed25b70668f486fcc0b0adfb5ec9c61e5696..6c3ac040fb40f856b749bb76972719a88d2adb1a 100644
|
| --- a/content/browser/browser_main_loop.cc
|
| +++ b/content/browser/browser_main_loop.cc
|
| @@ -46,6 +46,7 @@
|
| #include "base/trace_event/trace_event.h"
|
| #include "build/build_config.h"
|
| #include "components/discardable_memory/service/discardable_shared_memory_manager.h"
|
| +#include "components/display_compositor/host_shared_bitmap_manager.h"
|
| #include "components/tracing/common/process_metrics_memory_dump_provider.h"
|
| #include "components/tracing/common/trace_config_file.h"
|
| #include "components/tracing/common/trace_to_console.h"
|
| @@ -77,7 +78,6 @@
|
| #include "content/browser/webui/content_web_ui_controller_factory.h"
|
| #include "content/browser/webui/url_data_manager.h"
|
| #include "content/common/content_switches_internal.h"
|
| -#include "content/common/host_shared_bitmap_manager.h"
|
| #include "content/common/service_manager/service_manager_connection_impl.h"
|
| #include "content/public/browser/browser_main_parts.h"
|
| #include "content/public/browser/content_browser_client.h"
|
| @@ -831,7 +831,8 @@ void BrowserMainLoop::PostMainMessageLoopStart() {
|
| tracing::ProcessMetricsMemoryDumpProvider::RegisterForProcess(
|
| base::kNullProcessId);
|
| base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
|
| - HostSharedBitmapManager::current(), "HostSharedBitmapManager", nullptr);
|
| + display_compositor::HostSharedBitmapManager::current(),
|
| + "display_compositor::HostSharedBitmapManager", nullptr);
|
| base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
|
| skia::SkiaMemoryDumpProvider::GetInstance(), "Skia", nullptr);
|
| base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
|
|
|