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

content/test/gpu/gpu_test_config.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/test/gpu/gpu_test_config.h"
 
 #include "base/logging.h"
 #include "base/sys_info.h"
-#include "content/gpu/gpu_info_collector.h"
-#include "content/public/common/gpu_info.h"
 #include "content/test/gpu/gpu_test_expectations_parser.h"
+#include "gpu/config/gpu_info.h"
+#include "gpu/config/gpu_info_collector.h"
 
 namespace {
 
 GPUTestConfig::OS GetCurrentOS() {
 #if defined(OS_CHROMEOS)
   return GPUTestConfig::kOsChromeOS;
 #elif defined(OS_LINUX) || defined(OS_OPENBSD)
   return GPUTestConfig::kOsLinux;
 #elif defined(OS_WIN)
   int32 major_version = 0;
@@ skipping 112 matching lines @@
 }
 
 GPUTestBotConfig::~GPUTestBotConfig() {
 }
 
 void GPUTestBotConfig::AddGPUVendor(uint32 gpu_vendor) {
   DCHECK_EQ(0u, GPUTestConfig::gpu_vendor().size());
   GPUTestConfig::AddGPUVendor(gpu_vendor);
 }
 
-bool GPUTestBotConfig::SetGPUInfo(const content::GPUInfo& gpu_info) {
+bool GPUTestBotConfig::SetGPUInfo(const gpu::GPUInfo& gpu_info) {
   DCHECK(validate_gpu_info_);
   if (gpu_info.gpu.device_id == 0 || gpu_info.gpu.vendor_id == 0)
     return false;
   ClearGPUVendor();
   AddGPUVendor(gpu_info.gpu.vendor_id);
   set_gpu_device_id(gpu_info.gpu.device_id);
   return true;
 }
 
 bool GPUTestBotConfig::IsValid() const {
@@ skipping 56 matching lines @@
 
 bool GPUTestBotConfig::Matches(const std::string& config_data) const {
   GPUTestExpectationsParser parser;
   GPUTestConfig config;
 
   if (!parser.ParseConfig(config_data, &config))
     return false;
   return Matches(config);
 }
 
-bool GPUTestBotConfig::LoadCurrentConfig(const content::GPUInfo* gpu_info) {
+bool GPUTestBotConfig::LoadCurrentConfig(const gpu::GPUInfo* gpu_info) {
   bool rt;
   if (gpu_info == NULL) {
-    content::GPUInfo my_gpu_info;
-    gpu_info_collector::GpuIDResult result;
-    result = gpu_info_collector::CollectGpuID(&my_gpu_info.gpu.vendor_id,
-                                              &my_gpu_info.gpu.device_id);
-    if (result == gpu_info_collector::kGpuIDNotSupported) {
+    gpu::GPUInfo my_gpu_info;
+    gpu::GpuIDResult result;
+    result = gpu::CollectGpuID(&my_gpu_info.gpu.vendor_id,
+                               &my_gpu_info.gpu.device_id);
+    if (result == gpu::kGpuIDNotSupported) {
       DisableGPUInfoValidation();
       rt = true;
     } else {
       rt = SetGPUInfo(my_gpu_info);
     }
   } else {
     rt = SetGPUInfo(*gpu_info);
   }
   set_os(GetCurrentOS());
   if (os() == kOsUnknown)
@@ skipping 20 matching lines @@
   GPUTestBotConfig my_config;
   if (!my_config.LoadCurrentConfig(NULL))
     return false;
   for (size_t i = 0 ; i < configs.size(); ++i) {
     if (my_config.Matches(configs[i]))
       return true;
   }
   return false;
 }