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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chromeos/network/network_state_handler_unittest.cc

Issue 2314853004: Remove calls to deprecated MessageLoop methods in chromeos. (Closed)
Patch Set: Created 4 years, 3 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
« chromeos/network/network_sms_handler_unittest.cc ('K') | « chromeos/network/network_sms_handler_unittest.cc ('k') | chromeos/network/prohibited_technologies_handler_unittest.cc » ('j') | chromeos/network/prohibited_technologies_handler_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/network_state_handler_unittest.cc
diff --git a/chromeos/network/network_state_handler_unittest.cc b/chromeos/network/network_state_handler_unittest.cc
index a48a3eb39cc95acce1d38576d0e250fc2e184a51..8c9245f150e22eae083a14dca659f9b841e488c1 100644
--- a/chromeos/network/network_state_handler_unittest.cc
+++ b/chromeos/network/network_state_handler_unittest.cc
@@ -14,6 +14,7 @@
#include "base/bind.h"
#include "base/macros.h"
#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
#include "base/values.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/shill_device_client.h"
@@ -36,14 +37,13 @@ void ErrorCallbackFunction(const std::string& error_name,
LOG(ERROR) << "Shill Error: " << error_name << " : " << error_message;
}
-const std::string kShillManagerClientStubWifiDevice =
- "/device/stub_wifi_device1";
-const std::string kShillManagerClientStubCellularDevice =
+const char kShillManagerClientStubWifiDevice[] = "/device/stub_wifi_device1";
+const char kShillManagerClientStubCellularDevice[] =
"/device/stub_cellular_device1";
-const std::string kShillManagerClientStubDefaultService = "/service/eth1";
-const std::string kShillManagerClientStubDefaultWifi = "/service/wifi1";
-const std::string kShillManagerClientStubWifi2 = "/service/wifi2";
-const std::string kShillManagerClientStubCellular = "/service/cellular1";
+const char kShillManagerClientStubDefaultService[] = "/service/eth1";
+const char kShillManagerClientStubDefaultWifi[] = "/service/wifi1";
+const char kShillManagerClientStubWifi2[] = "/service/wifi2";
+const char kShillManagerClientStubCellular[] = "/service/cellular1";
using chromeos::DeviceState;
using chromeos::NetworkState;
@@ -187,7 +187,7 @@ class NetworkStateHandlerTest : public testing::Test {
test_observer_.reset(new TestObserver(network_state_handler_.get()));
network_state_handler_->AddObserver(test_observer_.get(), FROM_HERE);
network_state_handler_->InitShillPropertyHandler();
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
test_observer_->reset_change_counts();
}
@@ -209,7 +209,7 @@ class NetworkStateHandlerTest : public testing::Test {
}
void SetupDefaultShillState() {
- message_loop_.RunUntilIdle(); // Process any pending updates
+ base::RunLoop().RunUntilIdle(); // Process any pending updates
device_test_ =
DBusThreadManager::Get()->GetShillDeviceClient()->GetTestInterface();
ASSERT_TRUE(device_test_);
@@ -254,9 +254,7 @@ class NetworkStateHandlerTest : public testing::Test {
shill::kStateIdle);
}
- void UpdateManagerProperties() {
- message_loop_.RunUntilIdle();
- }
+ void UpdateManagerProperties() { base::RunLoop().RunUntilIdle(); }
void SetServiceProperty(const std::string& service_path,
const std::string& key,
@@ -326,7 +324,7 @@ TEST_F(NetworkStateHandlerTest, GetNetworkList) {
profile_test_->AddProfile(profile, "" /* userhash */);
EXPECT_TRUE(profile_test_->AddService(profile, wifi_favorite_path));
UpdateManagerProperties();
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(kNumShillManagerClientStubImplServices + 1,
test_observer_->network_count());
@@ -407,7 +405,7 @@ TEST_F(NetworkStateHandlerTest, GetVisibleNetworks) {
shill::kTypeWifi,
shill::kStateIdle,
false /* add_to_visible */);
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(kNumShillManagerClientStubImplServices + 1,
test_observer_->network_count());
@@ -419,7 +417,7 @@ TEST_F(NetworkStateHandlerTest, GetVisibleNetworks) {
// Change the visible state of a network.
SetServiceProperty(kShillManagerClientStubWifi2, shill::kVisibleProperty,
base::FundamentalValue(false));
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
network_state_handler_->GetVisibleNetworkList(&networks);
EXPECT_EQ(kNumShillManagerClientStubImplServices - 1, networks.size());
}
@@ -437,7 +435,7 @@ TEST_F(NetworkStateHandlerTest, TechnologyChanged) {
// Run the message loop. An additional notification will be received when
// Shill updates the enabled technologies. The state should remain AVAILABLE.
test_observer_->reset_change_counts();
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(1u, test_observer_->device_list_changed_count());
EXPECT_EQ(
NetworkStateHandler::TECHNOLOGY_AVAILABLE,
@@ -455,7 +453,7 @@ TEST_F(NetworkStateHandlerTest, TechnologyChanged) {
// Run the message loop. State should change to ENABLED.
test_observer_->reset_change_counts();
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(1u, test_observer_->device_list_changed_count());
EXPECT_EQ(
NetworkStateHandler::TECHNOLOGY_ENABLED,
@@ -464,19 +462,19 @@ TEST_F(NetworkStateHandlerTest, TechnologyChanged) {
TEST_F(NetworkStateHandlerTest, TechnologyState) {
manager_test_->RemoveTechnology(shill::kTypeWimax);
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(
NetworkStateHandler::TECHNOLOGY_UNAVAILABLE,
network_state_handler_->GetTechnologyState(NetworkTypePattern::Wimax()));
manager_test_->AddTechnology(shill::kTypeWimax, false);
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(
NetworkStateHandler::TECHNOLOGY_AVAILABLE,
network_state_handler_->GetTechnologyState(NetworkTypePattern::Wimax()));
manager_test_->SetTechnologyInitializing(shill::kTypeWimax, true);
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(
NetworkStateHandler::TECHNOLOGY_UNINITIALIZED,
network_state_handler_->GetTechnologyState(NetworkTypePattern::Wimax()));
@@ -484,13 +482,13 @@ TEST_F(NetworkStateHandlerTest, TechnologyState) {
manager_test_->SetTechnologyInitializing(shill::kTypeWimax, false);
network_state_handler_->SetTechnologyEnabled(
NetworkTypePattern::Wimax(), true, network_handler::ErrorCallback());
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(
NetworkStateHandler::TECHNOLOGY_ENABLED,
network_state_handler_->GetTechnologyState(NetworkTypePattern::Wimax()));
manager_test_->RemoveTechnology(shill::kTypeWimax);
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(
NetworkStateHandler::TECHNOLOGY_UNAVAILABLE,
network_state_handler_->GetTechnologyState(NetworkTypePattern::Wimax()));
@@ -505,14 +503,14 @@ TEST_F(NetworkStateHandlerTest, ServicePropertyChanged) {
EXPECT_EQ(1, test_observer_->PropertyUpdatesForService(eth1));
base::StringValue security_class_value("TestSecurityClass");
SetServiceProperty(eth1, shill::kSecurityClassProperty, security_class_value);
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
ethernet = network_state_handler_->GetNetworkState(eth1);
EXPECT_EQ("TestSecurityClass", ethernet->security_class());
EXPECT_EQ(2, test_observer_->PropertyUpdatesForService(eth1));
// Changing a service to the existing value should not trigger an update.
SetServiceProperty(eth1, shill::kSecurityClassProperty, security_class_value);
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(2, test_observer_->PropertyUpdatesForService(eth1));
}
@@ -551,7 +549,7 @@ TEST_F(NetworkStateHandlerTest, NetworkConnectionStateChanged) {
base::StringValue connection_state_idle_value(shill::kStateIdle);
service_test_->SetServiceProperty(eth1, shill::kStateProperty,
connection_state_idle_value);
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(shill::kStateIdle,
test_observer_->NetworkConnectionStateForService(eth1));
EXPECT_EQ(1, test_observer_->ConnectionStateChangesForService(eth1));
@@ -559,7 +557,7 @@ TEST_F(NetworkStateHandlerTest, NetworkConnectionStateChanged) {
// signal the observer.
service_test_->SetServiceProperty(eth1, shill::kStateProperty,
connection_state_idle_value);
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(1, test_observer_->ConnectionStateChangesForService(eth1));
}
@@ -572,7 +570,7 @@ TEST_F(NetworkStateHandlerTest, DefaultServiceDisconnected) {
base::StringValue connection_state_idle_value(shill::kStateIdle);
service_test_->SetServiceProperty(eth1, shill::kStateProperty,
connection_state_idle_value);
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
// Expect two changes: first when eth1 becomes disconnected, second when
// wifi1 becomes the default.
EXPECT_EQ(2u, test_observer_->default_network_change_count());
@@ -582,7 +580,7 @@ TEST_F(NetworkStateHandlerTest, DefaultServiceDisconnected) {
test_observer_->reset_change_counts();
service_test_->SetServiceProperty(wifi1, shill::kStateProperty,
connection_state_idle_value);
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(1u, test_observer_->default_network_change_count());
EXPECT_EQ("", test_observer_->default_network());
}
@@ -597,7 +595,7 @@ TEST_F(NetworkStateHandlerTest, DefaultServiceConnected) {
connection_state_idle_value);
service_test_->SetServiceProperty(wifi1, shill::kStateProperty,
connection_state_idle_value);
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(std::string(), test_observer_->default_network());
// Connect ethernet, should become the default network.
@@ -605,7 +603,7 @@ TEST_F(NetworkStateHandlerTest, DefaultServiceConnected) {
base::StringValue connection_state_ready_value(shill::kStateReady);
service_test_->SetServiceProperty(eth1, shill::kStateProperty,
connection_state_ready_value);
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(eth1, test_observer_->default_network());
EXPECT_EQ(shill::kStateReady,
test_observer_->default_network_connection_state());
@@ -625,7 +623,7 @@ TEST_F(NetworkStateHandlerTest, DefaultServiceChanged) {
base::StringValue(shill::kStateIdle));
manager_test_->SetManagerProperty(shill::kDefaultServiceProperty,
base::StringValue(wifi1));
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(wifi1, test_observer_->default_network());
EXPECT_EQ(1u, test_observer_->default_network_change_count());
@@ -634,7 +632,7 @@ TEST_F(NetworkStateHandlerTest, DefaultServiceChanged) {
test_observer_->reset_change_counts();
service_test_->SetServiceProperty(wifi1, shill::kStateProperty,
base::StringValue(shill::kStateReady));
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(shill::kStateReady,
test_observer_->default_network_connection_state());
EXPECT_EQ(1u, test_observer_->default_network_change_count());
@@ -644,14 +642,14 @@ TEST_F(NetworkStateHandlerTest, DefaultServiceChanged) {
test_observer_->reset_change_counts();
SetServiceProperty(wifi1, shill::kSecurityClassProperty,
base::StringValue("TestSecurityClass"));
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(1u, test_observer_->default_network_change_count());
// No default network updates for signal strength changes.
test_observer_->reset_change_counts();
SetServiceProperty(wifi1, shill::kSignalStrengthProperty,
base::FundamentalValue(32));
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(0u, test_observer_->default_network_change_count());
// Change the default network to a Connecting network, then set the
@@ -660,19 +658,19 @@ TEST_F(NetworkStateHandlerTest, DefaultServiceChanged) {
test_observer_->reset_change_counts();
SetServiceProperty(wifi1, shill::kStateProperty,
base::StringValue(shill::kStateIdle));
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(1u, test_observer_->default_network_change_count());
EXPECT_EQ(std::string(), test_observer_->default_network());
const std::string wifi2 = kShillManagerClientStubWifi2;
manager_test_->SetManagerProperty(shill::kDefaultServiceProperty,
base::StringValue(wifi2));
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(1u, test_observer_->default_network_change_count());
// Change the connection state of the default network, observer should fire.
SetServiceProperty(wifi2, shill::kStateProperty,
base::StringValue(shill::kStateReady));
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(wifi2, test_observer_->default_network());
EXPECT_EQ(2u, test_observer_->default_network_change_count());
}
@@ -683,7 +681,7 @@ TEST_F(NetworkStateHandlerTest, RequestUpdate) {
kShillManagerClientStubDefaultWifi));
network_state_handler_->RequestUpdateForNetwork(
kShillManagerClientStubDefaultWifi);
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(2, test_observer_->PropertyUpdatesForService(
kShillManagerClientStubDefaultWifi));
}
« chromeos/network/network_sms_handler_unittest.cc ('K') | « chromeos/network/network_sms_handler_unittest.cc ('k') | chromeos/network/prohibited_technologies_handler_unittest.cc » ('j') | chromeos/network/prohibited_technologies_handler_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698