| Index: ui/compositor/compositor_unittest.cc
|
| diff --git a/ui/compositor/compositor_unittest.cc b/ui/compositor/compositor_unittest.cc
|
| index 1cf3ae2a0a2a90be3f748f109e6c6e081474ab20..1aafddbc10d29776f6ea55dfcf77e23fae84ca61 100644
|
| --- a/ui/compositor/compositor_unittest.cc
|
| +++ b/ui/compositor/compositor_unittest.cc
|
| @@ -94,7 +94,14 @@ TEST_F(CompositorTest, ReleaseWidgetWithOutputSurfaceNeverCreated) {
|
| compositor()->SetVisible(true);
|
| }
|
|
|
| -TEST_F(CompositorTest, CreateAndReleaseOutputSurface) {
|
| +#if defined(OS_WIN)
|
| +// TODO(crbug.com/608436): Flaky on windows trybots
|
| +#define MAYBE_CreateAndReleaseOutputSurface \
|
| + DISABLED_CreateAndReleaseOutputSurface
|
| +#else
|
| +#define MAYBE_CreateAndReleaseOutputSurface CreateAndReleaseOutputSurface
|
| +#endif
|
| +TEST_F(CompositorTest, MAYBE_CreateAndReleaseOutputSurface) {
|
| std::unique_ptr<Layer> root_layer(new Layer(ui::LAYER_SOLID_COLOR));
|
| root_layer->SetBounds(gfx::Rect(10, 10));
|
| compositor()->SetRootLayer(root_layer.get());
|
|
|