Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(145)

Unified Diff: chromeos/network/network_device_handler_unittest.cc

Issue 2845973003: Use ScopedTaskEnvironment instead of MessageLoopForUI in chromeos tests. (Closed)
Patch Set: CR Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/network/geolocation_handler_unittest.cc ('k') | chromeos/network/network_sms_handler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/network_device_handler_unittest.cc
diff --git a/chromeos/network/network_device_handler_unittest.cc b/chromeos/network/network_device_handler_unittest.cc
index 863f52ce9c145db0bf7f01bd7e0e1bdc5c38a0cc..22a4479dee4ba420baad367aa3be000755806b08 100644
--- a/chromeos/network/network_device_handler_unittest.cc
+++ b/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_;
« no previous file with comments | « chromeos/network/geolocation_handler_unittest.cc ('k') | chromeos/network/network_sms_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698