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 f0934df2bd42391e8793c40793431e67328f7a32..a4150cada60bfa01ebb2b7b22425bb18ecc3fdc1 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 |
@@ -10,10 +10,10 @@ |
#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" |
@@ -74,7 +74,7 @@ class MockCrossProcessFrameConnector : public CrossProcessFrameConnector { |
class RenderWidgetHostViewChildFrameTest : public testing::Test { |
public: |
- RenderWidgetHostViewChildFrameTest() : task_scheduler_(&message_loop_) {} |
+ RenderWidgetHostViewChildFrameTest() = default; |
void SetUp() override { |
browser_context_.reset(new TestBrowserContext); |
@@ -115,8 +115,8 @@ class RenderWidgetHostViewChildFrameTest : public testing::Test { |
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(); |
@@ -136,10 +136,8 @@ class RenderWidgetHostViewChildFrameTest : public testing::Test { |
} |
protected: |
- base::MessageLoopForUI message_loop_; |
gab
2017/05/01 19:05:04
ForUI?
fdoray
2017/05/03 17:38:14
Done.
|
- |
// TaskScheduler is used by RenderWidgetHostImpl constructor. |
- base::test::ScopedTaskScheduler task_scheduler_; |
+ base::test::ScopedTaskEnvironment scoped_task_environment_; |
std::unique_ptr<BrowserContext> browser_context_; |
MockRenderWidgetHostDelegate delegate_; |