| Index: chrome/test/gpu/gpu_feature_browsertest.cc
|
| ===================================================================
|
| --- chrome/test/gpu/gpu_feature_browsertest.cc (revision 124620)
|
| +++ chrome/test/gpu/gpu_feature_browsertest.cc (working copy)
|
| @@ -323,24 +323,5 @@
|
| RunTest(url, "\"SUCCESS\"", false);
|
| }
|
|
|
| -class ThreadedCompositorTest : public GpuFeatureTest {
|
| - public:
|
| - virtual void SetUpCommandLine(CommandLine* command_line) {
|
| - GpuFeatureTest::SetUpCommandLine(command_line);
|
| - command_line->AppendSwitch(switches::kEnableThreadedCompositing);
|
| - }
|
| -};
|
| -
|
| -#if defined(OS_CHROMEOS)
|
| -// crbug.com/116438
|
| -#define MAYBE_ThreadedCompositor DISABLED_ThreadedCompositor
|
| -#else
|
| -#define MAYBE_ThreadedCompositor ThreadedCompositor
|
| -#endif
|
| -IN_PROC_BROWSER_TEST_F(ThreadedCompositorTest, MAYBE_ThreadedCompositor) {
|
| - const FilePath url(FILE_PATH_LITERAL("feature_compositing.html"));
|
| - RunTest(url, EXPECT_GPU_SWAP_BUFFERS);
|
| -}
|
| -
|
| } // namespace anonymous
|
|
|
|
|