Use ScopedTaskEnvironment instead of MessageLoopForUI in chromeos tests.

ScopedTaskEnvironment allows usage of ThreadTaskRunnerHandle and
base/task_scheduler/post_task.h within its scope. It should be
instantiated in everytest that uses either of these APIs
(i.e. no test should instantiate a MessageLoop directly).

Motivation for ScopedTaskEnvironment can be found in:
https://docs.google.com/document/d/1QabRo8c7D9LsYY3cEcaPQbOCLo8Tu-6VLykYXyl3Pkk/edit

BUG=708584
R=gab@chromium.org
TBR=stevenjb@chromium.org

Review-Url: https://codereview.chromium.org/2845973003
Cr-Commit-Position: refs/heads/master@{#467781}

chromeos/audio/cras_audio_handler_unittest.cc

@@ -12,8 +12,8 @@
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "base/test/scoped_task_environment.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "chromeos/audio/audio_devices_pref_handler.h"
@@ -251,7 +251,9 @@ class FakeVideoCaptureManager {
 // Test param is the version of stabel device id used by audio node.
 class CrasAudioHandlerTest : public testing::TestWithParam<int> {
  public:
-  CrasAudioHandlerTest() {}
+  CrasAudioHandlerTest()
+      : scoped_task_environment_(
+            base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
   ~CrasAudioHandlerTest() override {}
 
   void SetUp() override {
@@ -409,7 +411,7 @@ class CrasAudioHandlerTest : public testing::TestWithParam<int> {
   }
 
  protected:
-  base::MessageLoopForUI message_loop_;
+  base::test::ScopedTaskEnvironment scoped_task_environment_;
   CrasAudioHandler* cras_audio_handler_ = nullptr;         // Not owned.
   FakeCrasAudioClient* fake_cras_audio_client_ = nullptr;  // Not owned.
   std::unique_ptr<TestObserver> test_observer_;

chromeos/cryptohome/system_salt_getter_unittest.cc

@@ -5,8 +5,8 @@
 #include "chromeos/cryptohome/system_salt_getter.h"
 
 #include "base/bind.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "base/test/scoped_task_environment.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_cryptohome_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -22,7 +22,9 @@ void CopySystemSalt(std::string* out_system_salt,
 
 class SystemSaltGetterTest : public testing::Test {
  protected:
-  SystemSaltGetterTest() : fake_cryptohome_client_(NULL) {}
+  SystemSaltGetterTest()
+      : scoped_task_environment_(
+            base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
 
   void SetUp() override {
     fake_cryptohome_client_ = new FakeCryptohomeClient;
@@ -40,8 +42,8 @@ class SystemSaltGetterTest : public testing::Test {
     DBusThreadManager::Shutdown();
   }
 
-  base::MessageLoopForUI message_loop_;
-  FakeCryptohomeClient* fake_cryptohome_client_;
+  base::test::ScopedTaskEnvironment scoped_task_environment_;
+  FakeCryptohomeClient* fake_cryptohome_client_ = nullptr;
 };
 
 TEST_F(SystemSaltGetterTest, GetSystemSalt) {

chromeos/network/firewall_hole_unittest.cc

@@ -7,6 +7,7 @@
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
+#include "base/test/scoped_task_environment.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/mock_permission_broker_client.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -29,7 +30,9 @@ ACTION_TEMPLATE(InvokeCallback,
 
 class FirewallHoleTest : public testing::Test {
  public:
-  FirewallHoleTest() {}
+  FirewallHoleTest()
+      : scoped_task_environment_(
+            base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
   ~FirewallHoleTest() override {}
 
   void SetUp() override {
@@ -51,7 +54,7 @@ class FirewallHoleTest : public testing::Test {
   }
 
  private:
-  base::MessageLoopForUI message_loop_;
+  base::test::ScopedTaskEnvironment scoped_task_environment_;
 
  protected:
   base::RunLoop run_loop_;

chromeos/network/geolocation_handler_unittest.cc

@@ -7,10 +7,10 @@
 #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"
@@ -21,8 +21,9 @@ namespace chromeos {
 
 class GeolocationHandlerTest : public testing::Test {
  public:
-  GeolocationHandlerTest() : manager_test_(NULL) {
-  }
+  GeolocationHandlerTest()
+      : scoped_task_environment_(
+            base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
 
   ~GeolocationHandlerTest() override {}
 
@@ -94,9 +95,9 @@ class GeolocationHandlerTest : public testing::Test {
   }
 
  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_;
 

chromeos/network/network_device_handler_unittest.cc

@@ -6,8 +6,8 @@
 
 #include "base/bind.h"
 #include "base/macros.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "base/test/scoped_task_environment.h"
 #include "base/values.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_shill_device_client.h"
@@ -31,7 +31,9 @@ const char kDefaultPin[] = "1111";
 
 class NetworkDeviceHandlerTest : public testing::Test {
  public:
-  NetworkDeviceHandlerTest() : fake_device_client_(NULL) {}
+  NetworkDeviceHandlerTest()
+      : scoped_task_environment_(
+            base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
   ~NetworkDeviceHandlerTest() override {}
 
   void SetUp() override {
@@ -99,12 +101,11 @@ class NetworkDeviceHandlerTest : public testing::Test {
   }
 
  protected:
+  base::test::ScopedTaskEnvironment scoped_task_environment_;
   std::string result_;
-
-  FakeShillDeviceClient* fake_device_client_;
+  FakeShillDeviceClient* fake_device_client_ = nullptr;
   std::unique_ptr<NetworkDeviceHandler> network_device_handler_;
   std::unique_ptr<NetworkStateHandler> network_state_handler_;
-  base::MessageLoopForUI message_loop_;
   base::Closure success_callback_;
   network_handler::DictionaryResultCallback properties_success_callback_;
   network_handler::StringResultCallback string_success_callback_;

chromeos/network/network_sms_handler_unittest.cc

@@ -9,8 +9,8 @@
 #include <string>
 
 #include "base/command_line.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "base/test/scoped_task_environment.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_device_client.h"
@@ -51,7 +51,9 @@ class TestObserver : public NetworkSmsHandler::Observer {
 
 class NetworkSmsHandlerTest : public testing::Test {
  public:
-  NetworkSmsHandlerTest() {}
+  NetworkSmsHandlerTest()
+      : scoped_task_environment_(
+            base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
   ~NetworkSmsHandlerTest() override {}
 
   void SetUp() override {
@@ -88,7 +90,7 @@ class NetworkSmsHandlerTest : public testing::Test {
   }
 
  protected:
-  base::MessageLoopForUI message_loop_;
+  base::test::ScopedTaskEnvironment scoped_task_environment_;
   std::unique_ptr<NetworkSmsHandler> network_sms_handler_;
   std::unique_ptr<TestObserver> test_observer_;
 };

chromeos/network/network_state_handler_unittest.cc

@@ -14,8 +14,8 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/macros.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "base/test/scoped_task_environment.h"
 #include "base/values.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
@@ -198,7 +198,9 @@ namespace chromeos {
 class NetworkStateHandlerTest : public testing::Test {
  public:
   NetworkStateHandlerTest()
-      : device_test_(nullptr),
+      : scoped_task_environment_(
+            base::test::ScopedTaskEnvironment::MainThreadType::UI),
+        device_test_(nullptr),
         manager_test_(nullptr),
         profile_test_(nullptr),
         service_test_(nullptr) {}
@@ -295,7 +297,7 @@ class NetworkStateHandlerTest : public testing::Test {
     network_state_handler_->GetTetherNetworkList(limit, list);
   }
 
-  base::MessageLoopForUI message_loop_;
+  base::test::ScopedTaskEnvironment scoped_task_environment_;
   std::unique_ptr<NetworkStateHandler> network_state_handler_;
   std::unique_ptr<TestObserver> test_observer_;
   ShillDeviceClient::TestInterface* device_test_;

chromeos/network/prohibited_technologies_handler_unittest.cc

@@ -12,8 +12,8 @@
 #include "base/callback.h"
 #include "base/json/json_reader.h"
 #include "base/macros.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "base/test/scoped_task_environment.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/network/managed_network_configuration_handler_impl.h"
 #include "chromeos/network/network_configuration_handler.h"
@@ -27,7 +27,9 @@ namespace chromeos {
 
 class ProhibitedTechnologiesHandlerTest : public NetworkStateTest {
  public:
-  ProhibitedTechnologiesHandlerTest() {}
+  ProhibitedTechnologiesHandlerTest()
+      : scoped_task_environment_(
+            base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
 
   void SetUp() override {
     DBusThreadManager::Initialize();
@@ -110,7 +112,7 @@ class ProhibitedTechnologiesHandlerTest : public NetworkStateTest {
   std::unique_ptr<ManagedNetworkConfigurationHandlerImpl>
       managed_config_handler_;
   std::unique_ptr<NetworkProfileHandler> network_profile_handler_;
-  base::MessageLoopForUI message_loop_;
+  base::test::ScopedTaskEnvironment scoped_task_environment_;
   base::DictionaryValue global_config_disable_wifi;
   base::DictionaryValue global_config_disable_wifi_and_cell;
 

chromeos/network/shill_property_handler_unittest.cc

@@ -13,8 +13,8 @@
 
 #include "base/bind.h"
 #include "base/macros.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "base/test/scoped_task_environment.h"
 #include "base/values.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_device_client.h"
@@ -163,11 +163,12 @@ class TestListener : public internal::ShillPropertyHandler::Listener {
 class ShillPropertyHandlerTest : public testing::Test {
  public:
   ShillPropertyHandlerTest()
-      : manager_test_(NULL),
+      : scoped_task_environment_(
+            base::test::ScopedTaskEnvironment::MainThreadType::UI),
+        manager_test_(NULL),
         device_test_(NULL),
         service_test_(NULL),
-        profile_test_(NULL) {
-  }
+        profile_test_(NULL) {}
   ~ShillPropertyHandlerTest() override {}
 
   void SetUp() override {
@@ -285,7 +286,7 @@ class ShillPropertyHandlerTest : public testing::Test {
     AddService(shill::kTypeCellular, "stub_cellular1", shill::kStateIdle);
   }
 
-  base::MessageLoopForUI message_loop_;
+  base::test::ScopedTaskEnvironment scoped_task_environment_;
   std::unique_ptr<TestListener> listener_;
   std::unique_ptr<internal::ShillPropertyHandler> shill_property_handler_;
   ShillManagerClient::TestInterface* manager_test_;