Add ScopedTaskScheduler to RenderWidgetHostViewChildFrameTest

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>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #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"
 #include "cc/surfaces/surface_manager.h"
 #include "cc/surfaces/surface_sequence.h"
 #include "content/browser/compositor/test/no_transport_image_transport_factory.h"
 #include "content/browser/frame_host/cross_process_frame_connector.h"
 #include "content/browser/gpu/compositor_util.h"
 #include "content/browser/renderer_host/render_widget_host_delegate.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
@@ skipping 37 matching lines @@
     return nullptr;
   }
 
   cc::SurfaceInfo last_surface_info_;
 };
 
 }  // namespace
 
 class RenderWidgetHostViewChildFrameTest : public testing::Test {
  public:
   RenderWidgetHostViewChildFrameTest() {}

[alexmos, 2017/02/28 18:00:36]

Not sure if that'll fix the trybot failures, but do you need to initialize
task_scheduler_ with the message_loop_, like you did in
https://codereview.chromium.org/2710053003/ ? 

 
   void SetUp() override {
     browser_context_.reset(new TestBrowserContext);
 
 // ImageTransportFactory doesn't exist on Android.
 #if !defined(OS_ANDROID)
     ImageTransportFactory::InitializeForUnitTests(
         base::WrapUnique(new NoTransportImageTransportFactory));
 #else
     ContextProviderFactoryImpl::Initialize(&gpu_channel_factory_);
@@ skipping 30 matching lines @@
     ContextProviderFactoryImpl::Terminate();
 #endif
   }
 
   cc::SurfaceId GetSurfaceId() const {
     return cc::SurfaceId(view_->frame_sink_id_, view_->local_surface_id_);
   }
 
  protected:
   base::MessageLoopForUI message_loop_;
+
+  // Needed by RenderWidgetHostImpl constructor on Windows.
+  base::test::ScopedTaskScheduler task_scheduler_;
+
   std::unique_ptr<BrowserContext> browser_context_;
   MockRenderWidgetHostDelegate delegate_;
 
   // Tests should set these to NULL if they've already triggered their
   // destruction.
   RenderWidgetHostImpl* widget_host_;
   RenderWidgetHostViewChildFrame* view_;
   MockCrossProcessFrameConnector* test_frame_connector_;
 
 #if defined(OS_ANDROID)
@@ skipping 17 matching lines @@
 }
 
 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_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;
 
   view_->SetSize(view_size);
   view_->Show();
 
   view_->OnSwapCompositorFrame(
       0, CreateDelegatedFrame(scale_factor, view_size, view_rect));
 
@@ skipping 10 matching lines @@
 #endif
 
     // 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_);
   }
 }
 
 }  // namespace content