Move gpu_test_config stuff from content/ to gpu/

chrome/test/perf/rendering/throughput_tests.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 "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
@@ skipping 12 matching lines @@
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/tracing.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chrome/test/perf/browser_perf_test.h"
 #include "chrome/test/perf/perf_test.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #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"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gl/gl_switches.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
@@ skipping 493 matching lines @@
 IN_PROC_BROWSER_TEST_F(ThroughputTestGPU, DrawImageShadowGPU) {
   RunTest("canvas2d_balls_with_shadow", kNone | kIsGpuCanvasTest);
 }
 
 IN_PROC_BROWSER_TEST_F(ThroughputTestThread, DrawImageShadowGPU) {
   RunTest("canvas2d_balls_with_shadow", kNone | kIsGpuCanvasTest);
 }
 
 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);
 }
 
 IN_PROC_BROWSER_TEST_F(ThroughputTestGPU, CanvasTextGPU) {
   RunTest("canvas2d_balls_text", kNone | kIsGpuCanvasTest);
 }
 
 IN_PROC_BROWSER_TEST_F(ThroughputTestSW, CanvasFillPathSW) {
   RunTest("canvas2d_balls_fill_path", kNone);
 }
 
 IN_PROC_BROWSER_TEST_F(ThroughputTestGPU, CanvasFillPathGPU) {
   RunTest("canvas2d_balls_fill_path", kNone | kIsGpuCanvasTest);
 }
 
 IN_PROC_BROWSER_TEST_F(ThroughputTestSW, CanvasSingleImageSW) {
   RunCanvasBenchTest("single_image", kNone);
 }
 
 IN_PROC_BROWSER_TEST_F(ThroughputTestGPU, CanvasSingleImageGPU) {
   if (IsGpuAvailable() &&
-      GPUTestBotConfig::CurrentConfigMatches("MAC AMD"))
+      gpu::GPUTestBotConfig::CurrentConfigMatches("MAC AMD"))
     return;
   RunCanvasBenchTest("single_image", kNone | kIsGpuCanvasTest);
 }
 
 IN_PROC_BROWSER_TEST_F(ThroughputTestSW, CanvasManyImagesSW) {
   RunCanvasBenchTest("many_images", kNone);
 }
 
 IN_PROC_BROWSER_TEST_F(ThroughputTestGPU, CanvasManyImagesGPU) {
   RunCanvasBenchTest("many_images", kNone | kIsGpuCanvasTest);
 }
 
 IN_PROC_BROWSER_TEST_F(ThroughputTestThread, CanvasManyImagesGPU) {
   RunCanvasBenchTest("many_images", kNone | kIsGpuCanvasTest);
 }
 
 }  // namespace