Use TaskScheduler instead of WorkerPool in x11_hotplug_event_handler.cc.

content/browser/compositor/software_output_device_ozone_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/compositor/software_output_device_ozone.h"
 
 #include <memory>
 
 #include "base/macros.h"
-#include "base/message_loop/message_loop.h"
+#include "base/test/scoped_task_environment.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/test/context_factories_for_test.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/vsync_provider.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/ozone/public/ozone_platform.h"
@@ skipping 38 matching lines @@
 class SoftwareOutputDeviceOzoneTest : public testing::Test {
  public:
   SoftwareOutputDeviceOzoneTest();
   ~SoftwareOutputDeviceOzoneTest() override;
 
   void SetUp() override;
   void TearDown() override;
 
  protected:
   std::unique_ptr<content::SoftwareOutputDeviceOzone> output_device_;
-  bool enable_pixel_output_;
+  bool enable_pixel_output_ = false;
 
  private:
+  base::test::ScopedTaskEnvironment scoped_task_environment_;
   std::unique_ptr<ui::Compositor> compositor_;
-  std::unique_ptr<base::MessageLoop> message_loop_;
   TestPlatformWindowDelegate window_delegate_;
   std::unique_ptr<ui::PlatformWindow> window_;
 
   DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDeviceOzoneTest);
 };
 
 SoftwareOutputDeviceOzoneTest::SoftwareOutputDeviceOzoneTest()
-    : enable_pixel_output_(false) {
-  message_loop_.reset(new base::MessageLoopForUI);
-}
+    : scoped_task_environment_(
+          base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
 
 SoftwareOutputDeviceOzoneTest::~SoftwareOutputDeviceOzoneTest() {
 }
 
 void SoftwareOutputDeviceOzoneTest::SetUp() {
   ui::ContextFactory* context_factory = nullptr;
   ui::ContextFactoryPrivate* context_factory_private = nullptr;
   ui::InitializeContextFactoryForTests(enable_pixel_output_, &context_factory,
                                        &context_factory_private);
 
@@ skipping 49 matching lines @@
   // Increase size.
   output_device_->Resize(size, 1.f);
 
   canvas = output_device_->BeginPaint(damage);
   canvas_size.SetSize(canvas->getBaseLayerSize().width(),
                       canvas->getBaseLayerSize().height());
   EXPECT_EQ(size.ToString(), canvas_size.ToString());
 
 }