Add ScopedTaskScheduler to RenderWidgetHostViewChildFrameTest

content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc

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..0d007e94fa9c8d2dabc802575109a628d755531c 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
@@ -13,6 +13,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
+#include "base/test/scoped_task_scheduler.h"
 #include "build/build_config.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_factory.h"
@@ -121,6 +122,10 @@ class RenderWidgetHostViewChildFrameTest : public testing::Test {
 
  protected:
   base::MessageLoopForUI message_loop_;
+
+  // Needed by RenderWidgetHostImpl constructor on Windows.
+  base::test::ScopedTaskScheduler task_scheduler_;
+
   std::unique_ptr<BrowserContext> browser_context_;
   MockRenderWidgetHostDelegate delegate_;
 
@@ -158,16 +163,9 @@ TEST_F(RenderWidgetHostViewChildFrameTest, VisibilityTest) {
   ASSERT_FALSE(view_->IsShowing());
 }
 
-// http://crbug.com/696919
-#if defined(OS_WIN)
-#define MAYBE_SwapCompositorFrame DISABLED_SwapCompositorFrame
-#else
-#define MAYBE_SwapCompositorFrame SwapCompositorFrame
-#endif
-
 // Verify that OnSwapCompositorFrame behavior is correct when a delegated
 // frame is received from a renderer process.
-TEST_F(RenderWidgetHostViewChildFrameTest, MAYBE_SwapCompositorFrame) {
+TEST_F(RenderWidgetHostViewChildFrameTest, SwapCompositorFrame) {
   gfx::Size view_size(100, 100);
   gfx::Rect view_rect(view_size);
   float scale_factor = 1.f;