| Index: chrome/test/gpu/gpu_feature_browsertest.cc
|
| diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc
|
| index a1baa9390db9730959d834a2d25e493a8ca6a557..5e14cc4b8fbd258417d4925517e9203de85d0a9d 100644
|
| --- a/chrome/test/gpu/gpu_feature_browsertest.cc
|
| +++ b/chrome/test/gpu/gpu_feature_browsertest.cc
|
| @@ -246,13 +246,8 @@ IN_PROC_BROWSER_TEST_F(AcceleratedCompositingTest,
|
| RunEventTest(url, kSwapBuffersEvent, false);
|
| }
|
|
|
| -#if defined(OS_CHROMEOS)
|
| -#define MAYBE_WebGLAllowed DISABLED_WebGLAllowed
|
| -#else
|
| -#define MAYBE_WebGLAllowed WebGLAllowed
|
| -#endif
|
| -// Times out on CrOS: http://crbug.com/166060
|
| -IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MAYBE_WebGLAllowed) {
|
| +// Times out: http://crbug.com/166060
|
| +IN_PROC_BROWSER_TEST_F(GpuFeatureTest, DISABLED_WebGLAllowed) {
|
| EXPECT_FALSE(GpuDataManager::GetInstance()->IsFeatureBlacklisted(
|
| gpu::GPU_FEATURE_TYPE_WEBGL));
|
|
|
|
|