Use ScopedTaskEnvironment instead of MessageLoopForUI in device tests.

device/geolocation/wifi_data_provider_chromeos_unittest.cc

 // Copyright (c) 2011 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 "base/message_loop/message_loop.h"
+#include "device/geolocation/wifi_data_provider_chromeos.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/test/scoped_task_environment.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_manager_client.h"
 #include "chromeos/network/geolocation_handler.h"
-#include "device/geolocation/wifi_data_provider_chromeos.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace device {
 
 class GeolocationChromeOsWifiDataProviderTest : public testing::Test {
  protected:
-  GeolocationChromeOsWifiDataProviderTest() {}
+  GeolocationChromeOsWifiDataProviderTest()
+      : scoped_task_environment_(
+            base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
 
   void SetUp() override {
     chromeos::DBusThreadManager::Initialize();
     chromeos::NetworkHandler::Initialize();
     manager_client_ =
         chromeos::DBusThreadManager::Get()->GetShillManagerClient();
     manager_test_ = manager_client_->GetTestInterface();
     provider_ = new WifiDataProviderChromeOs();
     base::RunLoop().RunUntilIdle();
   }
@@ skipping 20 matching lines @@
                                                  channel);
         properties.SetStringWithoutPathExpansion(
             shill::kGeoSignalStrengthProperty, strength);
         manager_test_->AddGeoNetwork(shill::kGeoWifiAccessPointsProperty,
                                      properties);
       }
     }
     base::RunLoop().RunUntilIdle();
   }
 
-  base::MessageLoopForUI message_loop_;
+  base::test::ScopedTaskEnvironment scoped_task_environment_;
   scoped_refptr<WifiDataProviderChromeOs> provider_;
   chromeos::ShillManagerClient* manager_client_;
   chromeos::ShillManagerClient::TestInterface* manager_test_;
   WifiData::AccessPointDataSet ap_data_;
 };
 
 TEST_F(GeolocationChromeOsWifiDataProviderTest, NoAccessPoints) {
   base::RunLoop().RunUntilIdle();
   // Initial call to GetAccessPointData requests data and will return false.
   EXPECT_FALSE(GetAccessPointData());
@@ skipping 17 matching lines @@
 TEST_F(GeolocationChromeOsWifiDataProviderTest, GetManyAccessPoints) {
   base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(GetAccessPointData());
 
   AddAccessPoints(3, 4);
   EXPECT_TRUE(GetAccessPointData());
   ASSERT_EQ(12u, ap_data_.size());
 }
 
 }  // namespace device