Move gpu_test_config stuff from content/ to gpu/

gpu/config/gpu_test_config_unittest.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 "gpu/config/gpu_info.h"
+#include "gpu/config/gpu_test_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace gpu {
+
 class GPUTestConfigTest : public testing::Test {
  public:
   GPUTestConfigTest() { }
 
   virtual ~GPUTestConfigTest() { }
 
  protected:
   virtual void SetUp() { }
 
   virtual void TearDown() { }
 };
 
 TEST_F(GPUTestConfigTest, EmptyValues) {
   GPUTestConfig config;
   EXPECT_EQ(GPUTestConfig::kOsUnknown, config.os());
   EXPECT_EQ(0u, config.gpu_vendor().size());
   EXPECT_EQ(0u, config.gpu_device_id());
   EXPECT_EQ(GPUTestConfig::kBuildTypeUnknown, config.build_type());
 }
 
 TEST_F(GPUTestConfigTest, SetGPUInfo) {
-  gpu::GPUInfo gpu_info;
+  GPUInfo gpu_info;
   gpu_info.gpu.vendor_id = 0x10de;
   gpu_info.gpu.device_id = 0x0640;
   GPUTestBotConfig config;
   EXPECT_TRUE(config.SetGPUInfo(gpu_info));
   EXPECT_EQ(1u, config.gpu_vendor().size());
   EXPECT_EQ(gpu_info.gpu.vendor_id, config.gpu_vendor()[0]);
   EXPECT_EQ(gpu_info.gpu.device_id, config.gpu_device_id());
 
   gpu_info.gpu.vendor_id = 0x8086;
   gpu_info.gpu.device_id = 0x0046;
@@ skipping 194 matching lines @@
     config.set_os(GPUTestConfig::kOsWin7);
     GPUTestConfig config2;
     config2.AddGPUVendor(0x10de);
     EXPECT_TRUE(config.OverlapsWith(config2));
     EXPECT_TRUE(config2.OverlapsWith(config));
   }
 }
 
 TEST_F(GPUTestConfigTest, LoadCurrentConfig) {
   GPUTestBotConfig config;
-  gpu::GPUInfo gpu_info;
+  GPUInfo gpu_info;
   gpu_info.gpu.vendor_id = 0x10de;
   gpu_info.gpu.device_id = 0x0640;
   EXPECT_TRUE(config.LoadCurrentConfig(&gpu_info));
   EXPECT_TRUE(config.IsValid());
 }
 
+}  // namespace gpu
+