Move gpu_test_config stuff from content/ to gpu/

gpu/config/gpu_test_config.cc

Index: gpu/config/gpu_test_config.cc
===================================================================
--- gpu/config/gpu_test_config.cc	(revision 202179)
+++ gpu/config/gpu_test_config.cc	(working copy)
@@ -2,14 +2,16 @@
 // 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 "gpu/config/gpu_test_config.h"
 
 #include "base/logging.h"
 #include "base/sys_info.h"
-#include "content/test/gpu/gpu_test_expectations_parser.h"
 #include "gpu/config/gpu_info.h"
 #include "gpu/config/gpu_info_collector.h"
+#include "gpu/config/gpu_test_expectations_parser.h"
 
+namespace gpu {
+
 namespace {
 
 GPUTestConfig::OS GetCurrentOS() {
@@ -141,7 +143,7 @@
   GPUTestConfig::AddGPUVendor(gpu_vendor);
 }
 
-bool GPUTestBotConfig::SetGPUInfo(const gpu::GPUInfo& gpu_info) {
+bool GPUTestBotConfig::SetGPUInfo(const GPUInfo& gpu_info) {
   DCHECK(validate_gpu_info_);
   if (gpu_info.gpu.device_id == 0 || gpu_info.gpu.vendor_id == 0)
     return false;
@@ -218,14 +220,14 @@
   return Matches(config);
 }
 
-bool GPUTestBotConfig::LoadCurrentConfig(const gpu::GPUInfo* gpu_info) {
+bool GPUTestBotConfig::LoadCurrentConfig(const GPUInfo* gpu_info) {
   bool rt;
   if (gpu_info == NULL) {
-    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) {
+    GPUInfo my_gpu_info;
+    GpuIDResult result;
+    result = CollectGpuID(&my_gpu_info.gpu.vendor_id,
+                          &my_gpu_info.gpu.device_id);
+    if (result == kGpuIDNotSupported) {
       DisableGPUInfoValidation();
       rt = true;
     } else {
@@ -266,3 +268,5 @@
   return false;
 }
 
+}  // namespace gpu
+