Index: content/browser/frame_host/render_widget_host_view_guest_unittest.cc |
diff --git a/content/browser/frame_host/render_widget_host_view_guest_unittest.cc b/content/browser/frame_host/render_widget_host_view_guest_unittest.cc |
index e2eff57dc9bb1a2b2924de1104dbe6d7cf47dd20..5145d04d09931e5febe098bddc38eda9ac5dae92 100644 |
--- a/content/browser/frame_host/render_widget_host_view_guest_unittest.cc |
+++ b/content/browser/frame_host/render_widget_host_view_guest_unittest.cc |
@@ -8,10 +8,10 @@ |
#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 "base/test/scoped_task_environment.h" |
+#include "base/threading/thread_task_runner_handle.h" |
#include "build/build_config.h" |
#include "cc/surfaces/surface.h" |
#include "cc/surfaces/surface_manager.h" |
@@ -49,7 +49,9 @@ class MockRenderWidgetHostDelegate : public RenderWidgetHostDelegate { |
class RenderWidgetHostViewGuestTest : public testing::Test { |
public: |
- RenderWidgetHostViewGuestTest() : task_scheduler_(&message_loop_) {} |
+ RenderWidgetHostViewGuestTest() |
+ : scoped_task_environment_( |
+ base::test::ScopedTaskEnvironment::MainThreadType::UI) {} |
void SetUp() override { |
#if !defined(OS_ANDROID) |
@@ -75,8 +77,8 @@ class RenderWidgetHostViewGuestTest : 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(); |
@@ -84,10 +86,8 @@ class RenderWidgetHostViewGuestTest : public testing::Test { |
} |
protected: |
- base::MessageLoopForUI message_loop_; |
- |
// Needed by base::PostTaskWithTraits in RenderWidgetHostImpl constructor. |
- base::test::ScopedTaskScheduler task_scheduler_; |
+ base::test::ScopedTaskEnvironment scoped_task_environment_; |
std::unique_ptr<BrowserContext> browser_context_; |
MockRenderWidgetHostDelegate delegate_; |