Use ScopedTaskEnvironment instead of MessageLoopForUI in chromeos tests.

chromeos/network/geolocation_handler_unittest.cc

 // Copyright (c) 2013 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 "chromeos/network/geolocation_handler.h"
 
 #include <memory>
 
 #include "base/macros.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
+#include "base/test/scoped_task_environment.h"
 #include "base/values.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_manager_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 class GeolocationHandlerTest : public testing::Test {
  public:
-  GeolocationHandlerTest() : manager_test_(NULL) {
-  }
+  GeolocationHandlerTest()
+      : scoped_task_environment_(
+            base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
 
   ~GeolocationHandlerTest() override {}
 
   void SetUp() override {
     // Initialize DBusThreadManager with a stub implementation.
     DBusThreadManager::Initialize();
     // Get the test interface for manager / device.
     manager_test_ =
         DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface();
     ASSERT_TRUE(manager_test_);
@@ skipping 51 matching lines @@
     properties.SetStringWithoutPathExpansion(
         shill::kGeoMobileCountryCodeProperty, mcc);
     properties.SetStringWithoutPathExpansion(
         shill::kGeoMobileNetworkCodeProperty, mnc);
 
     manager_test_->AddGeoNetwork(shill::kGeoCellTowersProperty, properties);
     base::RunLoop().RunUntilIdle();
   }
 
  protected:
-  base::MessageLoopForUI message_loop_;
+  base::test::ScopedTaskEnvironment scoped_task_environment_;
   std::unique_ptr<GeolocationHandler> geolocation_handler_;
-  ShillManagerClient::TestInterface* manager_test_;
+  ShillManagerClient::TestInterface* manager_test_ = nullptr;
   WifiAccessPointVector wifi_access_points_;
   CellTowerVector cell_towers_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GeolocationHandlerTest);
 };
 
 TEST_F(GeolocationHandlerTest, NoAccessPoints) {
   // Inititial call should return false.
   EXPECT_FALSE(GetWifiAccessPoints());
@@ skipping 90 matching lines @@
   EXPECT_EQ(1, wifi_access_points_[0].channel);
 
   ASSERT_EQ(2u, cell_towers_.size());
   EXPECT_EQ("2", cell_towers_[1].ci);
   EXPECT_EQ("10", cell_towers_[0].lac);
   EXPECT_EQ("200", cell_towers_[1].mcc);
   EXPECT_EQ("101", cell_towers_[0].mnc);
 }
 
 }  // namespace chromeos