| Index: content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc
|
| diff --git a/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc b/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc
|
| index 2075199deb31f46930b554605806ad9692d98185..bdd44705f882b5d0eb074d785e801ff64c5ce282 100644
|
| --- a/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc
|
| +++ b/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc
|
| @@ -142,9 +142,12 @@ cc::CompositorFrame CreateDelegatedFrame(float scale_factor,
|
| #if defined(OS_WIN)
|
| #define MAYBE_VisibilityTest DISABLED_VisibilityTest
|
| #define MAYBE_SwapCompositorFrame DISABLED_SwapCompositorFrame
|
| +#define MAYBE_FrameEvictionKeepsLocalSurfaceId \
|
| + DISABLED_FrameEvictionKeepsLocalSurfaceId
|
| #else
|
| #define MAYBE_VisibilityTest VisibilityTest
|
| #define MAYBE_SwapCompositorFrame SwapCompositorFrame
|
| +#define MAYBE_FrameEvictionKeepsLocalSurfaceId FrameEvictionKeepsLocalSurfaceId
|
| #endif
|
|
|
| TEST_F(RenderWidgetHostViewChildFrameTest, MAYBE_VisibilityTest) {
|
| @@ -189,7 +192,8 @@ TEST_F(RenderWidgetHostViewChildFrameTest, MAYBE_SwapCompositorFrame) {
|
|
|
| // Check that frame eviction does not trigger allocation of a new local surface
|
| // id.
|
| -TEST_F(RenderWidgetHostViewChildFrameTest, FrameEvictionKeepsLocalSurfaceId) {
|
| +TEST_F(RenderWidgetHostViewChildFrameTest,
|
| + MAYBE_FrameEvictionKeepsLocalSurfaceId) {
|
| gfx::Size view_size(100, 100);
|
| gfx::Rect view_rect(view_size);
|
| float scale_factor = 1.f;
|
|
|