Fixing crash in GPU memory dump. Will investigate more correct solution in a separate CL.

content/common/gpu/gpu_channel_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/gpu/gpu_channel_manager.h"
 
-#include <algorithm>
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
-#include "base/trace_event/memory_dump_manager.h"
-#include "base/trace_event/process_memory_dump.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/gpu_memory_buffer_factory.h"
 #include "content/common/gpu/gpu_memory_manager.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/common/message_router.h"
 #include "gpu/command_buffer/common/value_state.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "gpu/command_buffer/service/mailbox_manager_impl.h"
 #include "gpu/command_buffer/service/memory_program_cache.h"
@@ skipping 83 matching lines @@
       gpu_memory_buffer_factory_(
           GpuMemoryBufferFactory::Create(GetGpuMemoryBufferFactoryType())),
       channel_(channel),
       filter_(
           new GpuChannelManagerMessageFilter(gpu_memory_buffer_factory_.get())),
       relinquish_resources_pending_(false),
       weak_factory_(this) {
   DCHECK(router_);
   DCHECK(io_task_runner);
   DCHECK(shutdown_event);
-  base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
-      this, io_task_runner_);
   channel_->AddFilter(filter_.get());
 }
 
 GpuChannelManager::~GpuChannelManager() {
   gpu_channels_.clear();
   if (default_offscreen_surface_.get()) {
     default_offscreen_surface_->Destroy();
     default_offscreen_surface_ = NULL;
   }
 }
@@ skipping 211 matching lines @@
 }
 
 gfx::GLSurface* GpuChannelManager::GetDefaultOffscreenSurface() {
   if (!default_offscreen_surface_.get()) {
     default_offscreen_surface_ =
         gfx::GLSurface::CreateOffscreenGLSurface(gfx::Size());
   }
   return default_offscreen_surface_.get();
 }
 
-bool GpuChannelManager::OnMemoryDump(
-    base::trace_event::ProcessMemoryDump* pmd) {
-  for (const auto& channel : gpu_channels_) {
-    auto dump_name = channel.second->GetChannelName();
-    std::replace(dump_name.begin(), dump_name.end(), '.', '_');
-
-    base::trace_event::MemoryAllocatorDump* dump = pmd->CreateAllocatorDump(
-        base::StringPrintf("gl/%s", dump_name.c_str()));
-
-    dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
-                    base::trace_event::MemoryAllocatorDump::kUnitsBytes,
-                    channel.second->GetMemoryUsage());
-  }
-
-  return true;
-}
-
 void GpuChannelManager::OnRelinquishResources() {
   relinquish_resources_pending_ = true;
   CheckRelinquishGpuResources();
 }
 
 void GpuChannelManager::CheckRelinquishGpuResources() {
   if (relinquish_resources_pending_ && gpu_channels_.size() <= 1) {
     relinquish_resources_pending_ = false;
     if (default_offscreen_surface_.get()) {
       default_offscreen_surface_->DestroyAndTerminateDisplay();
       default_offscreen_surface_ = NULL;
     }
 #if defined(USE_OZONE)
     ui::OzonePlatform::GetInstance()
         ->GetGpuPlatformSupport()
         ->RelinquishGpuResources(
             base::Bind(&GpuChannelManager::OnResourcesRelinquished,
                        weak_factory_.GetWeakPtr()));
 #else
     OnResourcesRelinquished();
 #endif
   }
 }
 
 void GpuChannelManager::OnResourcesRelinquished() {
   Send(new GpuHostMsg_ResourcesRelinquished());
 }
 
 }  // namespace content