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

Unified Diff: chromeos/dbus/fake_shill_service_client.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
« no previous file with comments | « chromeos/dbus/fake_shill_profile_client.cc ('k') | chromeos/dbus/gsm_sms_client_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/fake_shill_service_client.cc
diff --git a/chromeos/dbus/fake_shill_service_client.cc b/chromeos/dbus/fake_shill_service_client.cc
index 00735b4ea384973442f30b29202e7187afeb59a2..254f603d469a6d9eb1caa325adec8889aabe57ec 100644
--- a/chromeos/dbus/fake_shill_service_client.cc
+++ b/chromeos/dbus/fake_shill_service_client.cc
@@ -190,7 +190,7 @@ void FakeShillServiceClient::Connect(const dbus::ObjectPath& service_path,
service_properties->SetStringWithoutPathExpansion(shill::kErrorProperty, "");
// Set Associating.
- base::StringValue associating_value(shill::kStateAssociation);
+ base::Value associating_value(shill::kStateAssociation);
SetServiceProperty(service_path.value(), shill::kStateProperty,
associating_value);
@@ -213,7 +213,7 @@ void FakeShillServiceClient::Disconnect(const dbus::ObjectPath& service_path,
return;
}
// Set Idle after a delay
- base::StringValue idle_value(shill::kStateIdle);
+ base::Value idle_value(shill::kStateIdle);
base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
FROM_HERE, base::Bind(&FakeShillServiceClient::SetProperty,
weak_ptr_factory_.GetWeakPtr(), service_path,
@@ -240,9 +240,8 @@ void FakeShillServiceClient::ActivateCellularModem(
LOG(ERROR) << "Service not found: " << service_path.value();
error_callback.Run("Error.InvalidService", "Invalid Service");
}
- SetServiceProperty(service_path.value(),
- shill::kActivationStateProperty,
- base::StringValue(shill::kActivationStateActivating));
+ SetServiceProperty(service_path.value(), shill::kActivationStateProperty,
+ base::Value(shill::kActivationStateActivating));
// Set Activated after a delay
base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
FROM_HERE,
@@ -323,9 +322,8 @@ void FakeShillServiceClient::AddServiceWithIPConfig(
}
if (!ipconfig_path.empty()) {
- properties->SetWithoutPathExpansion(
- shill::kIPConfigProperty,
- new base::StringValue(ipconfig_path));
+ properties->SetWithoutPathExpansion(shill::kIPConfigProperty,
+ new base::Value(ipconfig_path));
}
DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
@@ -571,20 +569,17 @@ void FakeShillServiceClient::SetOtherServicesOffline(
properties->GetString(shill::kTypeProperty, &type);
if (type != service_type)
continue;
- properties->SetWithoutPathExpansion(
- shill::kStateProperty,
- new base::StringValue(shill::kStateIdle));
+ properties->SetWithoutPathExpansion(shill::kStateProperty,
+ new base::Value(shill::kStateIdle));
}
}
void FakeShillServiceClient::SetCellularActivated(
const dbus::ObjectPath& service_path,
const ErrorCallback& error_callback) {
- SetProperty(service_path,
- shill::kActivationStateProperty,
- base::StringValue(shill::kActivationStateActivated),
- base::Bind(&base::DoNothing),
- error_callback);
+ SetProperty(service_path, shill::kActivationStateProperty,
+ base::Value(shill::kActivationStateActivated),
+ base::Bind(&base::DoNothing), error_callback);
SetProperty(service_path, shill::kConnectableProperty, base::Value(true),
base::Bind(&base::DoNothing), error_callback);
}
@@ -612,20 +607,20 @@ void FakeShillServiceClient::ContinueConnect(const std::string& service_path) {
if (passphrase == "failure") {
// Simulate a password failure.
SetServiceProperty(service_path, shill::kErrorProperty,
- base::StringValue(shill::kErrorBadPassphrase));
+ base::Value(shill::kErrorBadPassphrase));
SetServiceProperty(service_path, shill::kStateProperty,
- base::StringValue(shill::kStateFailure));
+ base::Value(shill::kStateFailure));
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
base::Bind(
base::IgnoreResult(&FakeShillServiceClient::SetServiceProperty),
weak_ptr_factory_.GetWeakPtr(), service_path, shill::kErrorProperty,
- base::StringValue(shill::kErrorBadPassphrase)));
+ base::Value(shill::kErrorBadPassphrase)));
} else {
// Set Online.
VLOG(1) << "Setting state to Online " << service_path;
SetServiceProperty(service_path, shill::kStateProperty,
- base::StringValue(shill::kStateOnline));
+ base::Value(shill::kStateOnline));
}
}
« no previous file with comments | « chromeos/dbus/fake_shill_profile_client.cc ('k') | chromeos/dbus/gsm_sms_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698