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

chrome/browser/task_manager/task_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 "chrome/browser/task_manager/task_manager.h"
 
 #include "base/bind.h"
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/rtl.h"
 #include "base/location.h"
@@ skipping 162 matching lines @@
  public:
   TaskManagerModelGpuDataManagerObserver() {
     content::GpuDataManager::GetInstance()->AddObserver(this);
   }
 
   ~TaskManagerModelGpuDataManagerObserver() override {
     content::GpuDataManager::GetInstance()->RemoveObserver(this);
   }
 
   static void NotifyVideoMemoryUsageStats(
-      const gpu::VideoMemoryUsageStats& video_memory_usage_stats) {
+      const content::GPUVideoMemoryUsageStats& video_memory_usage_stats) {
     TaskManager::GetInstance()->model()->NotifyVideoMemoryUsageStats(
         video_memory_usage_stats);
   }
 
-  void OnVideoMemoryUsageStatsUpdate(
-      const gpu::VideoMemoryUsageStats& video_memory_usage_stats) override {
+  void OnVideoMemoryUsageStatsUpdate(const content::GPUVideoMemoryUsageStats&
+                                         video_memory_usage_stats) override {
     if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
       NotifyVideoMemoryUsageStats(video_memory_usage_stats);
     } else {
       BrowserThread::PostTask(
           BrowserThread::UI, FROM_HERE, base::Bind(
               &TaskManagerModelGpuDataManagerObserver::
                   NotifyVideoMemoryUsageStats,
               video_memory_usage_stats));
     }
   }
@@ skipping 455 matching lines @@
 bool TaskManagerModel::GetVideoMemory(int index,
                                       size_t* video_memory,
                                       bool* has_duplicates) const {
   *video_memory = 0;
   *has_duplicates = false;
 
   base::ProcessId pid = GetProcessId(index);
   PerProcessValues& values(
       per_process_cache_[GetResource(index)->GetProcess()]);
   if (!values.is_video_memory_valid) {
-    gpu::VideoMemoryUsageStats::ProcessMap::const_iterator i =
+    content::GPUVideoMemoryUsageStats::ProcessMap::const_iterator i =
         video_memory_usage_stats_.process_map.find(pid);
     if (i == video_memory_usage_stats_.process_map.end())
       return false;
     values.is_video_memory_valid = true;
     // If this checked_cast asserts, then need to change this code to use
     // uint64_t instead of size_t.
     values.video_memory = base::checked_cast<size_t>(i->second.video_memory);
     values.video_memory_has_duplicates = i->second.has_duplicates;
   }
   *video_memory = values.video_memory;
@@ skipping 565 matching lines @@
      (*iter)->Refresh();
   }
 
   if (!resources_.empty()) {
     FOR_EACH_OBSERVER(TaskManagerModelObserver, observer_list_,
                       OnItemsChanged(0, ResourceCount()));
   }
 }
 
 void TaskManagerModel::NotifyVideoMemoryUsageStats(
-    const gpu::VideoMemoryUsageStats& video_memory_usage_stats) {
+    const content::GPUVideoMemoryUsageStats& video_memory_usage_stats) {
   DCHECK(pending_video_memory_usage_stats_update_);
   video_memory_usage_stats_ = video_memory_usage_stats;
   pending_video_memory_usage_stats_update_ = false;
 }
 
 void TaskManagerModel::NotifyBytesRead(const net::URLRequest& request,
                                        int64_t byte_count) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (!is_updating_byte_count_)
     return;
@@ skipping 310 matching lines @@
   params.disposition = NEW_FOREGROUND_TAB;
   chrome::Navigate(&params);
 }
 
 TaskManager::TaskManager()
     : model_(new TaskManagerModel(this)) {
 }
 
 TaskManager::~TaskManager() {
 }