Remove usage of ScopedTaskScheduler.

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 "base/test/scoped_task_environment.h"
+#include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "cc/surfaces/compositor_frame_sink_support.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_manager.h"
 #include "cc/surfaces/surface_sequence.h"
 #include "cc/test/begin_frame_args_test.h"
 #include "cc/test/fake_external_begin_frame_source.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"
@@ skipping 40 matching lines @@
     return nullptr;
   }
 
   cc::SurfaceInfo last_surface_info_;
 };
 
 }  // namespace
 
 class RenderWidgetHostViewChildFrameTest : public testing::Test {
  public:
-  RenderWidgetHostViewChildFrameTest() : task_scheduler_(&message_loop_) {}
+  RenderWidgetHostViewChildFrameTest()
+      : scoped_task_environment_(
+            base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
 
   void SetUp() override {
     browser_context_.reset(new TestBrowserContext);
 
 // ImageTransportFactory doesn't exist on Android.
 #if !defined(OS_ANDROID)
     ImageTransportFactory::InitializeForUnitTests(
         base::WrapUnique(new NoTransportImageTransportFactory));
 #endif
 
@@ skipping 20 matching lines @@
   }
 
   void TearDown() override {
     if (view_)
       view_->Destroy();
     delete widget_host_;
     delete test_frame_connector_;
 
     browser_context_.reset();
 
-    message_loop_.task_runner()->DeleteSoon(FROM_HERE,
-                                            browser_context_.release());
+    base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE,
+                                                    browser_context_.release());
     base::RunLoop().RunUntilIdle();
 #if !defined(OS_ANDROID)
     ImageTransportFactory::Terminate();
 #endif
   }
 
   cc::SurfaceId GetSurfaceId() const {
     return cc::SurfaceId(view_->frame_sink_id_, view_->local_surface_id_);
   }
 
   cc::LocalSurfaceId GetLocalSurfaceId() const {
     return view_->local_surface_id_;
   }
 
   void ClearCompositorSurfaceIfNecessary() {
     view_->ClearCompositorSurfaceIfNecessary();
   }
 
  protected:
-  base::MessageLoopForUI message_loop_;
-
   // TaskScheduler is used by RenderWidgetHostImpl constructor.

[gab, 2017/05/03 17:43:06]

Can drop this comment IMO

-  base::test::ScopedTaskScheduler task_scheduler_;
+  base::test::ScopedTaskEnvironment scoped_task_environment_;
 
   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_;
   std::unique_ptr<FakeRendererCompositorFrameSink>
@@ skipping 131 matching lines @@
     // Explicit ack through OnBeginFrameDidNotSwap is forwarded.
     cc::BeginFrameAck ack(source_id, 6, 4, false);
     view_->OnBeginFrameDidNotSwap(ack);
     EXPECT_EQ(ack, source.LastAckForObserver(view_->support_.get()));
   }
 
   view_->SetNeedsBeginFrames(false);
 }
 
 }  // namespace content