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

content/browser/gpu/gpu_data_manager_impl_private_unittest.cc

 // Copyright (c) 2013 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 <stddef.h>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "content/browser/gpu/gpu_data_manager_impl_private.h"
 #include "content/public/browser/gpu_data_manager_observer.h"
 #include "gpu/config/gpu_feature_type.h"
 #include "gpu/config/gpu_info.h"
 #include "gpu/config/gpu_switches.h"
-#include "gpu/ipc/common/memory_stats.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 #define LONG_STRING_CONST(...) #__VA_ARGS__
 
 namespace content {
 namespace {
 
 class TestObserver : public GpuDataManagerObserver {
  public:
   TestObserver()
       : gpu_info_updated_(false),
         video_memory_usage_stats_updated_(false) {
   }
   ~TestObserver() override {}
 
   bool gpu_info_updated() const { return gpu_info_updated_; }
   bool video_memory_usage_stats_updated() const {
     return video_memory_usage_stats_updated_;
   }
 
   void OnGpuInfoUpdate() override { gpu_info_updated_ = true; }
 
   void OnVideoMemoryUsageStatsUpdate(
-      const gpu::VideoMemoryUsageStats& stats) override {
+      const GPUVideoMemoryUsageStats& stats) override {
     video_memory_usage_stats_updated_ = true;
   }
 
   void Reset() {
     gpu_info_updated_ = false;
     video_memory_usage_stats_updated_ = false;
   }
 
  private:
   bool gpu_info_updated_;
@@ skipping 292 matching lines @@
 
   TestObserver observer;
   manager->AddObserver(&observer);
 
   {
     base::RunLoop run_loop;
     run_loop.RunUntilIdle();
   }
   EXPECT_FALSE(observer.video_memory_usage_stats_updated());
 
-  gpu::VideoMemoryUsageStats vram_stats;
+  GPUVideoMemoryUsageStats vram_stats;
   manager->UpdateVideoMemoryUsageStats(vram_stats);
   {
     base::RunLoop run_loop;
     run_loop.RunUntilIdle();
   }
   EXPECT_TRUE(observer.video_memory_usage_stats_updated());
 }
 
 base::Time GpuDataManagerImplPrivateTest::JustBeforeExpiration(
     const GpuDataManagerImplPrivate* manager) {
@@ skipping 404 matching lines @@
   EXPECT_TRUE(manager->UpdateActiveGpu(0x8086, 0x04a1));
   {
     base::RunLoop run_loop;
     run_loop.RunUntilIdle();
   }
   EXPECT_TRUE(observer.gpu_info_updated());
   EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
 }
 
 }  // namespace content