OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/file_util.h" | 6 #include "base/file_util.h" |
7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "base/test/trace_event_analyzer.h" | 9 #include "base/test/trace_event_analyzer.h" |
10 #include "base/version.h" | 10 #include "base/version.h" |
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
326 } | 326 } |
327 | 327 |
328 class ThreadedCompositorTest : public GpuFeatureTest { | 328 class ThreadedCompositorTest : public GpuFeatureTest { |
329 public: | 329 public: |
330 virtual void SetUpCommandLine(CommandLine* command_line) { | 330 virtual void SetUpCommandLine(CommandLine* command_line) { |
331 GpuFeatureTest::SetUpCommandLine(command_line); | 331 GpuFeatureTest::SetUpCommandLine(command_line); |
332 command_line->AppendSwitch(switches::kEnableThreadedCompositing); | 332 command_line->AppendSwitch(switches::kEnableThreadedCompositing); |
333 } | 333 } |
334 }; | 334 }; |
335 | 335 |
336 IN_PROC_BROWSER_TEST_F(ThreadedCompositorTest, FLAKY_ThreadedCompositor) { | 336 IN_PROC_BROWSER_TEST_F(ThreadedCompositorTest, DISABLED_ThreadedCompositor) { |
337 const FilePath url(FILE_PATH_LITERAL("feature_compositing.html")); | 337 const FilePath url(FILE_PATH_LITERAL("feature_compositing.html")); |
338 RunTest(url, EXPECT_GPU_SWAP_BUFFERS); | 338 RunTest(url, EXPECT_GPU_SWAP_BUFFERS); |
339 } | 339 } |
340 | 340 |
341 } // namespace anonymous | 341 } // namespace anonymous |
342 | 342 |
OLD | NEW |