| 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 ea75cfde1d2cbf15f9cbdcfad737442670f64e9c..dfbba97f96af72cb875605137e475dd93e20735f 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
|
| @@ -150,21 +150,23 @@ cc::CompositorFrame CreateDelegatedFrame(float scale_factor,
|
| return frame;
|
| }
|
|
|
| -TEST_F(RenderWidgetHostViewChildFrameTest, VisibilityTest) {
|
| - view_->Show();
|
| - ASSERT_TRUE(view_->IsShowing());
|
| -
|
| - view_->Hide();
|
| - ASSERT_FALSE(view_->IsShowing());
|
| -}
|
| -
|
| // http://crbug.com/696919
|
| #if defined(OS_WIN)
|
| +#define MAYBE_VisibilityTest DISABLED_VisibilityTest
|
| #define MAYBE_SwapCompositorFrame DISABLED_SwapCompositorFrame
|
| #else
|
| +#define MAYBE_VisibilityTest VisibilityTest
|
| #define MAYBE_SwapCompositorFrame SwapCompositorFrame
|
| #endif
|
|
|
| +TEST_F(RenderWidgetHostViewChildFrameTest, MAYBE_VisibilityTest) {
|
| + view_->Show();
|
| + ASSERT_TRUE(view_->IsShowing());
|
| +
|
| + view_->Hide();
|
| + ASSERT_FALSE(view_->IsShowing());
|
| +}
|
| +
|
| // Verify that OnSwapCompositorFrame behavior is correct when a delegated
|
| // frame is received from a renderer process.
|
| TEST_F(RenderWidgetHostViewChildFrameTest, MAYBE_SwapCompositorFrame) {
|
|
|