Revert of Decouple browser-specific GPU IPC messages from GPU service IPCs

content/common/gpu/gpu_memory_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_memory_manager.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/process_handle.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/trace_event/trace_event.h"
 #include "content/common/gpu/gpu_channel_manager.h"
-#include "content/common/gpu/gpu_channel_manager_delegate.h"
 #include "content/common/gpu/gpu_memory_tracking.h"
 #include "content/common/gpu/gpu_memory_uma_stats.h"
+#include "content/common/gpu/gpu_messages.h"
 #include "gpu/command_buffer/common/gpu_memory_allocation.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 
 using gpu::MemoryAllocation;
 
 namespace content {
 namespace {
 
 const uint64_t kBytesAllocatedStep = 16 * 1024 * 1024;
 
@@ skipping 21 matching lines @@
     uint64_t old_size,
     uint64_t new_size) {
   TrackValueChanged(old_size, new_size, &tracking_group->size_);
   TrackValueChanged(old_size, new_size, &bytes_allocated_current_);
 
   if (GetCurrentUsage() > bytes_allocated_historical_max_ +
                           kBytesAllocatedStep) {
       bytes_allocated_historical_max_ = GetCurrentUsage();
       // If we're blowing into new memory usage territory, spam the browser
       // process with the most up-to-date information about our memory usage.
-      SendUmaStatsToHost();
+      SendUmaStatsToBrowser();
   }
 }
 
 bool GpuMemoryManager::EnsureGPUMemoryAvailable(uint64_t /* size_needed */) {
   // TODO: Check if there is enough space. Lose contexts until there is.
   return true;
 }
 
 uint64_t GpuMemoryManager::GetTrackerMemoryUsage(
     gpu::gles2::MemoryTracker* tracker) const {
@@ skipping 34 matching lines @@
   video_memory_usage_stats->process_map[
       base::GetCurrentProcId()].video_memory = GetCurrentUsage();
   video_memory_usage_stats->process_map[
       base::GetCurrentProcId()].has_duplicates = true;
 
   video_memory_usage_stats->bytes_allocated = GetCurrentUsage();
   video_memory_usage_stats->bytes_allocated_historical_max =
       bytes_allocated_historical_max_;
 }
 
-void GpuMemoryManager::SendUmaStatsToHost() {
+void GpuMemoryManager::SendUmaStatsToBrowser() {
   if (!channel_manager_)
     return;
   GPUMemoryUmaStats params;
   params.bytes_allocated_current = GetCurrentUsage();
   params.bytes_allocated_max = bytes_allocated_historical_max_;
   params.context_group_count = static_cast<uint32_t>(tracking_groups_.size());
-  channel_manager_->delegate()->GpuMemoryUmaStats(params);
+  channel_manager_->Send(new GpuHostMsg_GpuMemoryUmaStats(params));
 }
 }  // namespace content