Keep a TaskScheduler instance in RenderWidgetHostViewGuestTest

content/browser/frame_host/render_widget_host_view_guest_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_guest.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/macros.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/browser_plugin/browser_plugin_guest.h"
 #include "content/browser/compositor/test/no_transport_image_transport_factory.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 22 matching lines @@
  private:
   // RenderWidgetHostDelegate:
   void Cut() override {}
   void Copy() override {}
   void Paste() override {}
   void SelectAll() override {}
 };
 
 class RenderWidgetHostViewGuestTest : public testing::Test {
  public:
-  RenderWidgetHostViewGuestTest() {}
+  RenderWidgetHostViewGuestTest() : task_scheduler_(&message_loop_) {}
 
   void SetUp() override {
 #if !defined(OS_ANDROID)
     ImageTransportFactory::InitializeForUnitTests(
         std::unique_ptr<ImageTransportFactory>(
             new NoTransportImageTransportFactory));
 #else
     ContextProviderFactoryImpl::Initialize(&gpu_channel_factory_);
     ui::ContextProviderFactory::SetInstance(
         ContextProviderFactoryImpl::GetInstance());
@@ skipping 22 matching lines @@
 #if !defined(OS_ANDROID)
     ImageTransportFactory::Terminate();
 #else
     ui::ContextProviderFactory::SetInstance(nullptr);
     ContextProviderFactoryImpl::Terminate();
 #endif
   }
 
  protected:
   base::MessageLoopForUI message_loop_;
+  base::test::ScopedTaskScheduler task_scheduler_;

[alexmos, 2017/02/23 22:31:54]

Perhaps also add a quick comment here why this is needed?

[tzik, 2017/02/23 23:49:42]

Done.

   std::unique_ptr<BrowserContext> browser_context_;
   MockRenderWidgetHostDelegate delegate_;
 
   // Tests should set these to NULL if they've already triggered their
   // destruction.
   RenderWidgetHostImpl* widget_host_;
   RenderWidgetHostViewGuest* view_;
 
 #if defined(OS_ANDROID)
   MockGpuChannelEstablishFactory gpu_channel_factory_;
 #endif
 
  private:
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewGuestTest);
 };
 
 }  // namespace
 
-// Fails on Windows, crbug.com/695375.
-#if defined(OS_WIN)
-#define MAYBE_VisibilityTest DISABLED_VisibilityTest
-#else
-#define MAYBE_VisibilityTest VisibilityTest
-#endif
-TEST_F(RenderWidgetHostViewGuestTest, MAYBE_VisibilityTest) {
+TEST_F(RenderWidgetHostViewGuestTest, VisibilityTest) {
   view_->Show();
   ASSERT_TRUE(view_->IsShowing());
 
   view_->Hide();
   ASSERT_FALSE(view_->IsShowing());
 }
 
 class TestBrowserPluginGuest : public BrowserPluginGuest {
  public:
   TestBrowserPluginGuest(WebContentsImpl* web_contents,
@@ skipping 175 matching lines @@
 
   browser_plugin_guest_->set_attached(false);
   browser_plugin_guest_->ResetTestData();
 
   view_->OnSwapCompositorFrame(
       0, CreateDelegatedFrame(scale_factor, view_size, view_rect));
   EXPECT_FALSE(GetSurfaceId().is_valid());
 }
 
 }  // namespace content