| Index: chrome/browser/chromeos/cros/network_library.cc
|
| diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc
|
| index 8600d8856b12e0e75dbc129a441e75a4d0c13ff0..f2f4a8c4fcaf1210faf6b49ce35283bd82c2f3ff 100644
|
| --- a/chrome/browser/chromeos/cros/network_library.cc
|
| +++ b/chrome/browser/chromeos/cros/network_library.cc
|
| @@ -359,12 +359,11 @@ bool Network::RequiresUserProfile() const {
|
| void Network::CopyCredentialsFromRemembered(Network* remembered) {
|
| }
|
|
|
| -void Network::SetValueProperty(const char* prop, Value* value) {
|
| +void Network::SetValueProperty(const char* prop, const base::Value& value) {
|
| DCHECK(prop);
|
| - DCHECK(value);
|
| if (!EnsureCrosLoaded())
|
| return;
|
| - CrosSetNetworkServiceProperty(service_path_, prop, *value);
|
| + CrosSetNetworkServiceProperty(service_path_, prop, value);
|
| }
|
|
|
| void Network::ClearProperty(const char* prop) {
|
| @@ -378,8 +377,7 @@ void Network::SetStringProperty(
|
| const char* prop, const std::string& str, std::string* dest) {
|
| if (dest)
|
| *dest = str;
|
| - scoped_ptr<Value> value(Value::CreateStringValue(str));
|
| - SetValueProperty(prop, value.get());
|
| + SetValueProperty(prop, base::StringValue(str));
|
| }
|
|
|
| void Network::SetOrClearStringProperty(const char* prop,
|
| @@ -397,15 +395,13 @@ void Network::SetOrClearStringProperty(const char* prop,
|
| void Network::SetBooleanProperty(const char* prop, bool b, bool* dest) {
|
| if (dest)
|
| *dest = b;
|
| - scoped_ptr<Value> value(Value::CreateBooleanValue(b));
|
| - SetValueProperty(prop, value.get());
|
| + SetValueProperty(prop, base::FundamentalValue(b));
|
| }
|
|
|
| void Network::SetIntegerProperty(const char* prop, int i, int* dest) {
|
| if (dest)
|
| *dest = i;
|
| - scoped_ptr<Value> value(Value::CreateIntegerValue(i));
|
| - SetValueProperty(prop, value.get());
|
| + SetValueProperty(prop, base::FundamentalValue(i));
|
| }
|
|
|
| void Network::SetPreferred(bool preferred) {
|
| @@ -884,7 +880,7 @@ void CellularNetwork::SetApn(const CellularApn& apn) {
|
| value.SetString(flimflam::kApnNetworkIdProperty, apn.network_id);
|
| value.SetString(flimflam::kApnUsernameProperty, apn.username);
|
| value.SetString(flimflam::kApnPasswordProperty, apn.password);
|
| - SetValueProperty(flimflam::kCellularApnProperty, &value);
|
| + SetValueProperty(flimflam::kCellularApnProperty, value);
|
| } else {
|
| ClearProperty(flimflam::kCellularApnProperty);
|
| }
|
|
|