| 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 06f3aba152d16c156292bd884b4b5f726ac4ab84..021099a6af89fed9c068bbfbc9a7a9d0c71a2237 100644
|
| --- a/chrome/browser/chromeos/cros/network_library.cc
|
| +++ b/chrome/browser/chromeos/cros/network_library.cc
|
| @@ -1286,7 +1286,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));
|
| + scoped_ptr<Value> value(base::StringValue::New(str));
|
| SetValueProperty(prop, value.get());
|
| }
|
|
|
| @@ -1305,14 +1305,14 @@ 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));
|
| + scoped_ptr<Value> value(base::BooleanValue::New(b));
|
| SetValueProperty(prop, value.get());
|
| }
|
|
|
| void Network::SetIntegerProperty(const char* prop, int i, int* dest) {
|
| if (dest)
|
| *dest = i;
|
| - scoped_ptr<Value> value(Value::CreateIntegerValue(i));
|
| + scoped_ptr<Value> value(base::NumberValue::New(i));
|
| SetValueProperty(prop, value.get());
|
| }
|
|
|
| @@ -4742,7 +4742,7 @@ void NetworkLibraryImplCros::SetCellularDataRoamingAllowed(bool new_value) {
|
| "w/o cellular device.";
|
| return;
|
| }
|
| - scoped_ptr<Value> value(Value::CreateBooleanValue(new_value));
|
| + scoped_ptr<Value> value(base::BooleanValue::New(new_value));
|
| chromeos::SetNetworkDeviceProperty(cellular->device_path().c_str(),
|
| kCellularAllowRoamingProperty,
|
| value.get());
|
| @@ -4888,7 +4888,7 @@ void NetworkLibraryImplCros::SetIPConfig(const NetworkIPConfig& ipconfig) {
|
| if (ipconfig_static) {
|
| // Save any changed details.
|
| if (ipconfig.address != ipconfig_static->address) {
|
| - scoped_ptr<Value> value(Value::CreateStringValue(ipconfig.address));
|
| + scoped_ptr<Value> value(base::StringValue::New(ipconfig.address));
|
| chromeos::SetNetworkIPConfigProperty(ipconfig_static->path,
|
| kAddressProperty,
|
| value.get());
|
| @@ -4899,21 +4899,21 @@ void NetworkLibraryImplCros::SetIPConfig(const NetworkIPConfig& ipconfig) {
|
| VLOG(1) << "IP config prefixlen is invalid for netmask "
|
| << ipconfig.netmask;
|
| } else {
|
| - scoped_ptr<Value> value(Value::CreateIntegerValue(prefixlen));
|
| + scoped_ptr<Value> value(base::NumberValue::New(prefixlen));
|
| chromeos::SetNetworkIPConfigProperty(ipconfig_static->path,
|
| kPrefixlenProperty,
|
| value.get());
|
| }
|
| }
|
| if (ipconfig.gateway != ipconfig_static->gateway) {
|
| - scoped_ptr<Value> value(Value::CreateStringValue(ipconfig.gateway));
|
| + scoped_ptr<Value> value(base::StringValue::New(ipconfig.gateway));
|
| chromeos::SetNetworkIPConfigProperty(ipconfig_static->path,
|
| kGatewayProperty,
|
| value.get());
|
| }
|
| if (ipconfig.name_servers != ipconfig_static->name_servers) {
|
| scoped_ptr<Value> value(
|
| - Value::CreateStringValue(ipconfig.name_servers));
|
| + base::StringValue::New(ipconfig.name_servers));
|
| chromeos::SetNetworkIPConfigProperty(ipconfig_static->path,
|
| kNameServersProperty,
|
| value.get());
|
| @@ -5613,7 +5613,7 @@ void NetworkLibraryImplStub::Init() {
|
| connected_devices_ = devices;
|
|
|
| NetworkDevice* cellular = new NetworkDevice("cellular");
|
| - scoped_ptr<Value> cellular_type(Value::CreateStringValue(kTypeCellular));
|
| + scoped_ptr<Value> cellular_type(base::StringValue::New(kTypeCellular));
|
| cellular->ParseValue(PROPERTY_INDEX_TYPE, cellular_type.get());
|
| cellular->IMSI_ = "123456789012345";
|
| device_map_["cellular"] = cellular;
|
|
|