| 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 405ca746b5a60ec68bf3bb8bbc458ac4276d1dd9..2234f79cfab39145ee0d3d9e759dabdf0aa61652 100644
|
| --- a/chrome/test/gpu/gpu_feature_browsertest.cc
|
| +++ b/chrome/test/gpu/gpu_feature_browsertest.cc
|
| @@ -256,7 +256,13 @@ IN_PROC_BROWSER_TEST_F(AcceleratedCompositingTest,
|
| RunEventTest(url, kSwapBuffersEvent, false);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLAllowed) {
|
| +// 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) {
|
| GpuFeatureType type =
|
| GpuDataManager::GetInstance()->GetBlacklistedFeatures();
|
| EXPECT_EQ(type, 0);
|
| @@ -265,7 +271,13 @@ IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLAllowed) {
|
| RunEventTest(url, kWebGLCreationEvent, true);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLBlocked) {
|
| +// 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) {
|
| const std::string json_blacklist =
|
| "{\n"
|
| " \"name\": \"gpu blacklist\",\n"
|
|
|