Disable RenderWidgetHostViewChildFrameTest.FrameEvictionKeepsLocalSurfaceId on Win

content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/frame_host/render_widget_host_view_child_frame.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 124 matching lines @@
   std::unique_ptr<cc::RenderPass> pass = cc::RenderPass::Create();
   pass->SetNew(1, gfx::Rect(size), damage, gfx::Transform());
   frame.render_pass_list.push_back(std::move(pass));
   return frame;
 }
 
 // http://crbug.com/696919
 #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) {
   view_->Show();
   ASSERT_TRUE(view_->IsShowing());
 
   view_->Hide();
   ASSERT_FALSE(view_->IsShowing());
 }
 
@@ skipping 24 matching lines @@
 
     // Surface ID should have been passed to CrossProcessFrameConnector to
     // be sent to the embedding renderer.
     EXPECT_EQ(cc::SurfaceInfo(id, scale_factor, view_size),
               test_frame_connector_->last_surface_info_);
   }
 }
 
 // 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;
 
   view_->SetSize(view_size);
   view_->Show();
 
   // Submit a frame. Remember the local surface id and check that has_frame()
   // returns true.
   view_->OnSwapCompositorFrame(
@@ skipping 11 matching lines @@
 
   // Submit another frame. Since it has the same size and scale as the first
   // one, the same surface id must be used. has_frame() must return true.
   view_->OnSwapCompositorFrame(
       0, CreateDelegatedFrame(scale_factor, view_size, view_rect));
   EXPECT_EQ(surface_id, GetSurfaceId());
   EXPECT_TRUE(view_->has_frame());
 }
 
 }  // namespace content