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

Unified Diff: chromeos/network/network_connect_unittest.cc

Issue 2664753002: Remove base::StringValue (Closed)
Patch Set: Rebase Created 3 years, 9 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
Index: chromeos/network/network_connect_unittest.cc
diff --git a/chromeos/network/network_connect_unittest.cc b/chromeos/network/network_connect_unittest.cc
index d39a93215b21e4c857042c5732662b4d74045603..0a3cd441a8e5da5ce2d5b9d8d5225a146ccb6c48 100644
--- a/chromeos/network/network_connect_unittest.cc
+++ b/chromeos/network/network_connect_unittest.cc
@@ -106,9 +106,9 @@ class NetworkConnectTest : public testing::Test {
"stub_wifi_device1");
device_test_->AddDevice(kCellular1DevicePath, shill::kTypeCellular,
"stub_cellular_device1");
- device_test_->SetDeviceProperty(
- kCellular1DevicePath, shill::kTechnologyFamilyProperty,
- base::StringValue(shill::kNetworkTechnologyGsm));
+ device_test_->SetDeviceProperty(kCellular1DevicePath,
+ shill::kTechnologyFamilyProperty,
+ base::Value(shill::kNetworkTechnologyGsm));
service_test_ =
DBusThreadManager::Get()->GetShillServiceClient()->GetTestInterface();
@@ -121,12 +121,11 @@ class NetworkConnectTest : public testing::Test {
add_to_visible);
service_test_->SetServiceProperty(kWiFi1ServicePath,
shill::kSecurityClassProperty,
- base::StringValue(shill::kSecurityWep));
+ base::Value(shill::kSecurityWep));
service_test_->SetServiceProperty(
kWiFi1ServicePath, shill::kConnectableProperty, base::Value(true));
- service_test_->SetServiceProperty(kWiFi1ServicePath,
- shill::kPassphraseProperty,
- base::StringValue("password"));
+ service_test_->SetServiceProperty(
+ kWiFi1ServicePath, shill::kPassphraseProperty, base::Value("password"));
// Create a cellular network.
service_test_->AddService(kCellular1ServicePath, kCellular1Guid,
@@ -136,7 +135,7 @@ class NetworkConnectTest : public testing::Test {
kCellular1ServicePath, shill::kConnectableProperty, base::Value(true));
service_test_->SetServiceProperty(
kCellular1ServicePath, shill::kActivationStateProperty,
- base::StringValue(shill::kActivationStateActivated));
+ base::Value(shill::kActivationStateActivated));
service_test_->SetServiceProperty(kCellular1ServicePath,
shill::kOutOfCreditsProperty,
base::Value(false));
@@ -249,7 +248,7 @@ TEST_F(NetworkConnectTest, ActivateCellular) {
service_test_->SetServiceProperty(
kCellular1ServicePath, shill::kActivationStateProperty,
- base::StringValue(shill::kActivationStateNotActivated));
+ base::Value(shill::kActivationStateNotActivated));
base::RunLoop().RunUntilIdle();
NetworkConnect::Get()->ConnectToNetworkId(kCellular1Guid);
@@ -260,10 +259,10 @@ TEST_F(NetworkConnectTest, ActivateCellular_Error) {
service_test_->SetServiceProperty(
kCellular1ServicePath, shill::kActivationStateProperty,
- base::StringValue(shill::kActivationStateNotActivated));
+ base::Value(shill::kActivationStateNotActivated));
service_test_->SetServiceProperty(
kCellular1ServicePath, shill::kActivationTypeProperty,
- base::StringValue(shill::kActivationTypeNonCellular));
+ base::Value(shill::kActivationTypeNonCellular));
base::RunLoop().RunUntilIdle();
NetworkConnect::Get()->ConnectToNetworkId(kCellular1Guid);
« no previous file with comments | « chromeos/network/network_configuration_handler_unittest.cc ('k') | chromeos/network/network_state_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698