Move gpu_test_config stuff from content/ to gpu/

chrome/test/perf/rendering/throughput_tests.cc

Index: chrome/test/perf/rendering/throughput_tests.cc
===================================================================
--- chrome/test/perf/rendering/throughput_tests.cc	(revision 202179)
+++ chrome/test/perf/rendering/throughput_tests.cc	(working copy)
@@ -30,8 +30,8 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
-#include "content/test/gpu/gpu_test_config.h"
 #include "googleurl/src/gurl.h"
+#include "gpu/config/gpu_test_config.h"
 #include "net/base/net_util.h"
 #include "net/dns/mock_host_resolver.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -545,21 +545,21 @@
 
 IN_PROC_BROWSER_TEST_F(ThroughputTestSW, CanvasToCanvasDrawSW) {
   if (IsGpuAvailable() &&
-      GPUTestBotConfig::CurrentConfigMatches("MAC AMD"))
+      gpu::GPUTestBotConfig::CurrentConfigMatches("MAC AMD"))
     return;
   RunTest("canvas2d_balls_draw_from_canvas", kNone);
 }
 
 IN_PROC_BROWSER_TEST_F(ThroughputTestGPU, CanvasToCanvasDrawGPU) {
   if (IsGpuAvailable() &&
-      GPUTestBotConfig::CurrentConfigMatches("MAC AMD"))
+      gpu::GPUTestBotConfig::CurrentConfigMatches("MAC AMD"))
     return;
   RunTest("canvas2d_balls_draw_from_canvas", kNone | kIsGpuCanvasTest);
 }
 
 IN_PROC_BROWSER_TEST_F(ThroughputTestSW, CanvasTextSW) {
   if (IsGpuAvailable() &&
-      GPUTestBotConfig::CurrentConfigMatches("MAC AMD"))
+      gpu::GPUTestBotConfig::CurrentConfigMatches("MAC AMD"))
     return;
   RunTest("canvas2d_balls_text", kNone);
 }
@@ -582,7 +582,7 @@
 
 IN_PROC_BROWSER_TEST_F(ThroughputTestGPU, CanvasSingleImageGPU) {
   if (IsGpuAvailable() &&
-      GPUTestBotConfig::CurrentConfigMatches("MAC AMD"))
+      gpu::GPUTestBotConfig::CurrentConfigMatches("MAC AMD"))
     return;
   RunCanvasBenchTest("single_image", kNone | kIsGpuCanvasTest);
 }