Move GPU device/driver info related code from content to gpu.

chrome/test/gpu/gpu_feature_browsertest.cc

Index: chrome/test/gpu/gpu_feature_browsertest.cc
===================================================================
--- chrome/test/gpu/gpu_feature_browsertest.cc	(revision 201645)
+++ chrome/test/gpu/gpu_feature_browsertest.cc	(working copy)
@@ -19,10 +19,10 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/common/content_switches.h"
-#include "content/public/common/gpu_feature_type.h"
-#include "content/public/common/gpu_info.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/test/gpu/gpu_test_config.h"
+#include "gpu/config/gpu_feature_type.h"
+#include "gpu/config/gpu_info.h"
 #include "net/base/net_util.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/compositor/compositor_setup.h"
@@ -35,7 +35,7 @@
 #endif
 
 using content::GpuDataManager;
-using content::GpuFeatureType;
+using gpu::GpuFeatureType;
 using trace_analyzer::Query;
 using trace_analyzer::TraceAnalyzer;
 using trace_analyzer::TraceEventVector;
@@ -73,7 +73,7 @@
   }
 
   void SetupBlacklist(const std::string& json_blacklist) {
-    content::GPUInfo gpu_info;
+    gpu::GPUInfo gpu_info;
     GpuDataManager::GetInstance()->InitializeForTesting(
         json_blacklist, gpu_info);
   }
@@ -185,7 +185,7 @@
 
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MAYBE_AcceleratedCompositingAllowed) {
   EXPECT_FALSE(GpuDataManager::GetInstance()->IsFeatureBlacklisted(
-      content::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING));
+      gpu::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING));
 
   const base::FilePath url(FILE_PATH_LITERAL("feature_compositing.html"));
   RunEventTest(url, kSwapBuffersEvent, true);
@@ -222,7 +222,7 @@
 IN_PROC_BROWSER_TEST_F(AcceleratedCompositingBlockedTest,
     MAYBE_AcceleratedCompositingBlocked) {
   EXPECT_TRUE(GpuDataManager::GetInstance()->IsFeatureBlacklisted(
-      content::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING));
+      gpu::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING));
 
   const base::FilePath url(FILE_PATH_LITERAL("feature_compositing.html"));
   RunEventTest(url, kSwapBuffersEvent, false);
@@ -258,7 +258,7 @@
 // Times out on CrOS: http://crbug.com/166060
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MAYBE_WebGLAllowed) {
   EXPECT_FALSE(GpuDataManager::GetInstance()->IsFeatureBlacklisted(
-      content::GPU_FEATURE_TYPE_WEBGL));
+      gpu::GPU_FEATURE_TYPE_WEBGL));
 
   const base::FilePath url(FILE_PATH_LITERAL("feature_webgl.html"));
   RunEventTest(url, kWebGLCreationEvent, true);
@@ -280,7 +280,7 @@
       "}";
   SetupBlacklist(json_blacklist);
   EXPECT_TRUE(GpuDataManager::GetInstance()->IsFeatureBlacklisted(
-      content::GPU_FEATURE_TYPE_WEBGL));
+      gpu::GPU_FEATURE_TYPE_WEBGL));
 
   const base::FilePath url(FILE_PATH_LITERAL("feature_webgl.html"));
   RunEventTest(url, kWebGLCreationEvent, false);
@@ -304,7 +304,7 @@
 
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MultisamplingAllowed) {
   EXPECT_FALSE(GpuDataManager::GetInstance()->IsFeatureBlacklisted(
-      content::GPU_FEATURE_TYPE_MULTISAMPLING));
+      gpu::GPU_FEATURE_TYPE_MULTISAMPLING));
 
   // Multisampling is not supported if running on top of osmesa.
   std::string use_gl = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
@@ -344,7 +344,7 @@
       "}";
   SetupBlacklist(json_blacklist);
   EXPECT_TRUE(GpuDataManager::GetInstance()->IsFeatureBlacklisted(
-      content::GPU_FEATURE_TYPE_MULTISAMPLING));
+      gpu::GPU_FEATURE_TYPE_MULTISAMPLING));
 
   const base::FilePath url(FILE_PATH_LITERAL("feature_multisampling.html"));
   RunTest(url, "\"FALSE\"", true);
@@ -373,7 +373,7 @@
     return;
 
   EXPECT_FALSE(GpuDataManager::GetInstance()->IsFeatureBlacklisted(
-      content::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS));
+      gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS));
 
   const base::FilePath url(FILE_PATH_LITERAL("feature_canvas2d.html"));
   RunEventTest(url, kAcceleratedCanvasCreationEvent, true);
@@ -395,7 +395,7 @@
       "}";
   SetupBlacklist(json_blacklist);
   EXPECT_TRUE(GpuDataManager::GetInstance()->IsFeatureBlacklisted(
-      content::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS));
+      gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS));
 
   const base::FilePath url(FILE_PATH_LITERAL("feature_canvas2d.html"));
   RunEventTest(url, kAcceleratedCanvasCreationEvent, false);