Revert of Mustash: move content::GPUVideoMemoryUsageStats to gpu::VideoMemoryUsageStats

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_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"
-#include "gpu/ipc/common/memory_stats.h"
 
 using gpu::MemoryAllocation;
 
 namespace content {
 namespace {
 
 const uint64_t kBytesAllocatedStep = 16 * 1024 * 1024;
 
 void TrackValueChanged(uint64_t old_size,
                        uint64_t new_size,
@@ skipping 53 matching lines @@
   return tracking_group;
 }
 
 void GpuMemoryManager::OnDestroyTrackingGroup(
     GpuMemoryTrackingGroup* tracking_group) {
   DCHECK(tracking_groups_.count(tracking_group->GetMemoryTracker()));
   tracking_groups_.erase(tracking_group->GetMemoryTracker());
 }
 
 void GpuMemoryManager::GetVideoMemoryUsageStats(
-    gpu::VideoMemoryUsageStats* video_memory_usage_stats) const {
+    GPUVideoMemoryUsageStats* video_memory_usage_stats) const {
   // For each context group, assign its memory usage to its PID
   video_memory_usage_stats->process_map.clear();
   for (TrackingGroupMap::const_iterator i =
        tracking_groups_.begin(); i != tracking_groups_.end(); ++i) {
     const GpuMemoryTrackingGroup* tracking_group = i->second;
     video_memory_usage_stats->process_map[
         tracking_group->GetPid()].video_memory += tracking_group->GetSize();
   }
 
   // Assign the total across all processes in the GPU process
@@ skipping 10 matching lines @@
 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_->Send(new GpuHostMsg_GpuMemoryUmaStats(params));
 }
 }  // namespace content