diff options
| author | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-28 23:38:02 +0000 |
|---|---|---|
| committer | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-28 23:38:02 +0000 |
| commit | 129f019eaa2016c4a7cf3fffd486d76baf22369c (patch) | |
| tree | 779588af03563c46f69dd98bd4afb26887f16cb2 /chrome/test/perf | |
| parent | 8623d0c2c5c9929ce0b1f27ea3915dc5d14eac8c (diff) | |
| download | chromium_src-129f019eaa2016c4a7cf3fffd486d76baf22369c.zip chromium_src-129f019eaa2016c4a7cf3fffd486d76baf22369c.tar.gz chromium_src-129f019eaa2016c4a7cf3fffd486d76baf22369c.tar.bz2 | |
Move gpu_test_config stuff from content/ to gpu/
Again, these code is not depending on any content stuff, so moving it to gpu/ side will allow us to disable more gpu tests per GPU.
BUG=230477
TEST=gpu_unittests,tree
TBR=kbr@chromium.org, piman@chromium.org
Review URL: https://codereview.chromium.org/15827008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202690 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/perf')
| -rw-r--r-- | chrome/test/perf/rendering/latency_tests.cc | 4 | ||||
| -rw-r--r-- | chrome/test/perf/rendering/throughput_tests.cc | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/chrome/test/perf/rendering/latency_tests.cc b/chrome/test/perf/rendering/latency_tests.cc index af3c761..3d499ad 100644 --- a/chrome/test/perf/rendering/latency_tests.cc +++ b/chrome/test/perf/rendering/latency_tests.cc @@ -25,7 +25,7 @@ #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" @@ -258,7 +258,7 @@ void LatencyTest::RunTest(const std::vector<int>& behaviors) { // 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) diff --git a/chrome/test/perf/rendering/throughput_tests.cc b/chrome/test/perf/rendering/throughput_tests.cc index 3586fab..5ae20df 100644 --- a/chrome/test/perf/rendering/throughput_tests.cc +++ b/chrome/test/perf/rendering/throughput_tests.cc @@ -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(ThroughputTestThread, DrawImageShadowGPU) { 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(ThroughputTestSW, CanvasSingleImageSW) { IN_PROC_BROWSER_TEST_F(ThroughputTestGPU, CanvasSingleImageGPU) { if (IsGpuAvailable() && - GPUTestBotConfig::CurrentConfigMatches("MAC AMD")) + gpu::GPUTestBotConfig::CurrentConfigMatches("MAC AMD")) return; RunCanvasBenchTest("single_image", kNone | kIsGpuCanvasTest); } |