diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-15 07:16:39 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-15 07:16:39 +0000 |
| commit | 79db29b2fa3545810a02c59949b2f89f867ffd95 (patch) | |
| tree | 75df6b49d57c8eae979acae0557bb881c31fdf65 | |
| parent | 5047d5c08119ad9689ab0e22af2c1425a86939c3 (diff) | |
| download | chromium_src-79db29b2fa3545810a02c59949b2f89f867ffd95.zip chromium_src-79db29b2fa3545810a02c59949b2f89f867ffd95.tar.gz chromium_src-79db29b2fa3545810a02c59949b2f89f867ffd95.tar.bz2 | |
Revert 175726 - "Disable GpuFeatureTest.WebGLBlocked and WebGLAllowed on ChromeOS"
The underlying bug has been fixed.
BUG=168282
Review URL: https://chromiumcodereview.appspot.com/11884033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176820 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/gpu/gpu_feature_browsertest.cc | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc index 81f430b..97cd838 100644 --- a/chrome/test/gpu/gpu_feature_browsertest.cc +++ b/chrome/test/gpu/gpu_feature_browsertest.cc @@ -255,13 +255,7 @@ IN_PROC_BROWSER_TEST_F(AcceleratedCompositingTest, RunEventTest(url, kSwapBuffersEvent, false); } -// Flaky on ChromeOS, http://crbug.com/168972 -#if defined(OS_CHROMEOS) -#define MAYBE_WebGLAllowed DISABLED_WebGLAllowed -#else -#define MAYBE_WebGLAllowed WebGLAllowed -#endif -IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MAYBE_WebGLAllowed) { +IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLAllowed) { GpuFeatureType type = GpuDataManager::GetInstance()->GetBlacklistedFeatures(); EXPECT_EQ(type, 0); @@ -270,13 +264,7 @@ IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MAYBE_WebGLAllowed) { RunEventTest(url, kWebGLCreationEvent, true); } -// Flaky on ChromeOS, http://crbug.com/168972 -#if defined(OS_CHROMEOS) -#define MAYBE_WebGLBlocked DISABLED_WebGLBlocked -#else -#define MAYBE_WebGLBlocked WebGLBlocked -#endif -IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MAYBE_WebGLBlocked) { +IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLBlocked) { const std::string json_blacklist = "{\n" " \"name\": \"gpu blacklist\",\n" |