Remove usage of ScopedTaskScheduler.

chromeos/disks/disk_mount_manager_unittest.cc

 // Copyright (c) 2012 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 <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
-#include "base/test/scoped_task_scheduler.h"
+#include "base/test/scoped_task_environment.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_cros_disks_client.h"
 #include "chromeos/disks/disk_mount_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::MakeUnique;
 using base::StringPrintf;
 using chromeos::disks::DiskMountManager;
 using chromeos::CrosDisksClient;
 using chromeos::DBusThreadManager;
@@ skipping 375 matching lines @@
 
 // Shift operators of ostream.
 // Needed to print values in case of EXPECT_* failure in gtest.
 std::ostream& operator<<(std::ostream& stream,
                          const FormatEvent& format_event) {
   return stream << format_event.DebugString();
 }
 
 class DiskMountManagerTest : public testing::Test {
  public:
-  DiskMountManagerTest() : scoped_task_scheduler_(&message_loop_) {}
+  DiskMountManagerTest()
+      : scoped_task_environment_(
+            base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
   ~DiskMountManagerTest() override {}
 
   // Sets up test dbus tread manager and disks mount manager.
   // Initializes disk mount manager disks and mount points.
   // Adds a test observer to the disk mount manager.
   void SetUp() override {
     fake_cros_disks_client_ = new FakeCrosDisksClient;
     DBusThreadManager::GetSetterForTesting()->SetCrosDisksClient(
         std::unique_ptr<CrosDisksClient>(fake_cros_disks_client_));
 
@@ skipping 56 matching lines @@
 
     for (size_t i = 0; i < arraysize(kTestMountPoints); i++)
       AddTestMountPoint(kTestMountPoints[i]);
   }
 
  protected:
   chromeos::FakeCrosDisksClient* fake_cros_disks_client_;
   std::unique_ptr<MockDiskMountManagerObserver> observer_;
 
  private:
-  base::MessageLoopForUI message_loop_;
-  base::test::ScopedTaskScheduler scoped_task_scheduler_;
+  base::test::ScopedTaskEnvironment scoped_task_environment_;
 };
 
 // Tests that the observer gets notified on attempt to format non existent mount
 // point.
 TEST_F(DiskMountManagerTest, Format_NotMounted) {
   DiskMountManager::GetInstance()->FormatMountedDevice("/mount/non_existent");
   ASSERT_EQ(1U, observer_->GetEventCount());
   EXPECT_EQ(FormatEvent(DiskMountManager::FORMAT_COMPLETED,
                         chromeos::FORMAT_ERROR_UNKNOWN, "/mount/non_existent"),
             observer_->GetFormatEvent(0));
@@ skipping 435 matching lines @@
   VerifyMountEvent(observer_->GetMountEvent(1), DiskMountManager::MOUNTING,
                    chromeos::MOUNT_ERROR_NONE, kDevice1MountPath);
   // The read-write device should be remounted in read-write mode.
   EXPECT_FALSE(
       manager->FindDiskBySourcePath(kDevice1SourcePath)->is_read_only());
   // Remounted disk should also appear as writable to observers.
   EXPECT_FALSE(observer_->GetMountEvent(1).disk->is_read_only());
 }
 
 }  // namespace