From 129f019eaa2016c4a7cf3fffd486d76baf22369c Mon Sep 17 00:00:00 2001 From: "zmo@chromium.org" Date: Tue, 28 May 2013 23:38:02 +0000 Subject: 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 --- chrome/test/gpu/gpu_feature_browsertest.cc | 10 +++++----- chrome/test/gpu/webgl_infobar_browsertest.cc | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'chrome/test/gpu') diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc index a07b3f7..d736b42 100644 --- a/chrome/test/gpu/gpu_feature_browsertest.cc +++ b/chrome/test/gpu/gpu_feature_browsertest.cc @@ -20,9 +20,9 @@ #include "content/public/browser/gpu_data_manager.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_feature_type.h" #include "gpu/config/gpu_info.h" +#include "gpu/config/gpu_test_config.h" #include "net/base/net_util.h" #include "ui/gl/gl_switches.h" #include "ui/compositor/compositor_setup.h" @@ -317,7 +317,7 @@ IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MultisamplingAllowed) { std::vector configs; configs.push_back("LINUX INTEL"); configs.push_back("MAC VMWARE"); - if (GPUTestBotConfig::CurrentConfigMatches(configs)) + if (gpu::GPUTestBotConfig::CurrentConfigMatches(configs)) return; const base::FilePath url(FILE_PATH_LITERAL("feature_multisampling.html")); @@ -326,7 +326,7 @@ IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MultisamplingAllowed) { IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MultisamplingBlocked) { // Multisampling fails on virtualized mac os. - if (GPUTestBotConfig::CurrentConfigMatches("MAC VMWARE")) + if (gpu::GPUTestBotConfig::CurrentConfigMatches("MAC VMWARE")) return; const std::string json_blacklist = @@ -360,7 +360,7 @@ class WebGLMultisamplingTest : public GpuFeatureTest { IN_PROC_BROWSER_TEST_F(WebGLMultisamplingTest, MultisamplingDisabled) { // Multisampling fails on virtualized mac os. - if (GPUTestBotConfig::CurrentConfigMatches("MAC VMWARE")) + if (gpu::GPUTestBotConfig::CurrentConfigMatches("MAC VMWARE")) return; const base::FilePath url(FILE_PATH_LITERAL("feature_multisampling.html")); @@ -369,7 +369,7 @@ IN_PROC_BROWSER_TEST_F(WebGLMultisamplingTest, MultisamplingDisabled) { IN_PROC_BROWSER_TEST_F(GpuFeatureTest, Canvas2DAllowed) { // Accelerated canvas 2D is not supported on XP. - if (GPUTestBotConfig::CurrentConfigMatches("XP")) + if (gpu::GPUTestBotConfig::CurrentConfigMatches("XP")) return; EXPECT_FALSE(GpuDataManager::GetInstance()->IsFeatureBlacklisted( diff --git a/chrome/test/gpu/webgl_infobar_browsertest.cc b/chrome/test/gpu/webgl_infobar_browsertest.cc index e5c8a0c..99ba769 100644 --- a/chrome/test/gpu/webgl_infobar_browsertest.cc +++ b/chrome/test/gpu/webgl_infobar_browsertest.cc @@ -24,7 +24,7 @@ #include "content/public/common/content_paths.h" #include "content/public/common/page_transition_types.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 "testing/gtest/include/gtest/gtest.h" #include "ui/gl/gl_implementation.h" @@ -66,7 +66,7 @@ class WebGLInfobarTest : public InProcessBrowserTest { }; IN_PROC_BROWSER_TEST_F(WebGLInfobarTest, ContextLossRaisesInfobar) { - if (GPUTestBotConfig::CurrentConfigMatches("XP")) + if (gpu::GPUTestBotConfig::CurrentConfigMatches("XP")) return; // Load page and wait for it to load. @@ -91,7 +91,7 @@ IN_PROC_BROWSER_TEST_F(WebGLInfobarTest, ContextLossRaisesInfobar) { } IN_PROC_BROWSER_TEST_F(WebGLInfobarTest, ContextLossInfobarReload) { - if (GPUTestBotConfig::CurrentConfigMatches("XP")) + if (gpu::GPUTestBotConfig::CurrentConfigMatches("XP")) return; content::DOMMessageQueue message_queue; -- cgit v1.1