Move gpu_test_config stuff from content/ to gpu/

chrome/test/perf/rendering/latency_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/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/test/test_switches.h"
 #include "base/test/trace_event_analyzer.h"
 #include "base/threading/platform_thread.h"
 #include "base/timer.h"
 #include "base/version.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_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/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
-#include "content/test/gpu/gpu_test_config.h"
+#include "gpu/config/gpu_test_config.h"
 #include "net/base/net_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 // Run with --vmodule=latency_tests=1 to print verbose latency info.
 
@@ skipping 212 matching lines @@
 void LatencyTest::RunTest(const std::vector<int>& behaviors) {
   verbose_ = (logging::GetVlogLevel("latency_tests") > 0);
 
   // Linux Intel uses mesa driver, where multisampling is not supported.
   // Multisampling is also not supported on virtualized mac os.
   // The latency test uses the multisampling blit trace event to determine when
   // the compositor is consuming the webgl context, so it currently doesn't work
   // without multisampling. Since the Latency test does not depend much on the
   // GPU, let's just skip testing on Intel since the data is redundant with
   // other non-Intel bots.
-  GPUTestBotConfig test_bot;
+  gpu::GPUTestBotConfig test_bot;
   test_bot.LoadCurrentConfig(NULL);
   const std::vector<uint32>& gpu_vendor = test_bot.gpu_vendor();
 #if defined(OS_LINUX)
   if (gpu_vendor.size() == 1 && gpu_vendor[0] == 0x8086)
     return;
 #endif  // defined(OS_LINUX)
 #if defined(OS_MACOSX)
   if (gpu_vendor.size() == 1 && gpu_vendor[0] == 0x15AD)
     return;
 #endif  // defined(OS_MACOSX)
@@ skipping 476 matching lines @@
     kInputHeavy | kInputDirty | kRafHeavy, \
     kInputHeavy | kInputDirty | kRafHeavy | kPaintHeavy, \
     kInputDirty | kPaintHeavy, \
     kInputDirty | kRafHeavy | kPaintHeavy)
 
 INSTANTIATE_TEST_CASE_P(, LatencyTestWebGL, LATENCY_SUITE_MODES());
 INSTANTIATE_TEST_CASE_P(, LatencyTestWebGLThread, LATENCY_SUITE_MODES());
 INSTANTIATE_TEST_CASE_P(, LatencyTestSW, LATENCY_SUITE_MODES());
 
 }  // namespace