| Index: chrome/browser/chromeos/proxy_cros_settings_provider.cc
|
| diff --git a/chrome/browser/chromeos/proxy_cros_settings_provider.cc b/chrome/browser/chromeos/proxy_cros_settings_provider.cc
|
| index 2d03a0edc815ede35244d5bd1ce1becb6b290aa2..4b36cb3752da83f551159ed69098eecd59a90f7a 100644
|
| --- a/chrome/browser/chromeos/proxy_cros_settings_provider.cc
|
| +++ b/chrome/browser/chromeos/proxy_cros_settings_provider.cc
|
| @@ -247,7 +247,7 @@ bool ProxyCrosSettingsProvider::Get(const std::string& path,
|
| if (config.mode ==
|
| chromeos::ProxyConfigServiceImpl::ProxyConfig::MODE_PAC_SCRIPT &&
|
| config.automatic_proxy.pac_url.is_valid()) {
|
| - data = Value::CreateStringValue(config.automatic_proxy.pac_url.spec());
|
| + data = base::StringValue::New(config.automatic_proxy.pac_url.spec());
|
| }
|
| found = true;
|
| } else if (path == kProxySingleHttp) {
|
| @@ -267,18 +267,18 @@ bool ProxyCrosSettingsProvider::Get(const std::string& path,
|
| chromeos::ProxyConfigServiceImpl::ProxyConfig::MODE_AUTO_DETECT ||
|
| config.mode ==
|
| chromeos::ProxyConfigServiceImpl::ProxyConfig::MODE_PAC_SCRIPT) {
|
| - data = Value::CreateIntegerValue(3);
|
| + data = base::NumberValue::New(3);
|
| } else if (config.mode ==
|
| chromeos::ProxyConfigServiceImpl::ProxyConfig::MODE_SINGLE_PROXY ||
|
| config.mode ==
|
| chromeos::ProxyConfigServiceImpl::ProxyConfig::MODE_PROXY_PER_SCHEME) {
|
| - data = Value::CreateIntegerValue(2);
|
| + data = base::NumberValue::New(2);
|
| } else {
|
| - data = Value::CreateIntegerValue(1);
|
| + data = base::NumberValue::New(1);
|
| }
|
| found = true;
|
| } else if (path == kProxySingle) {
|
| - data = Value::CreateBooleanValue(config.mode ==
|
| + data = base::BooleanValue::New(config.mode ==
|
| chromeos::ProxyConfigServiceImpl::ProxyConfig::MODE_SINGLE_PROXY);
|
| found = true;
|
| } else if (path == kProxyFtpUrl) {
|
| @@ -303,7 +303,7 @@ bool ProxyCrosSettingsProvider::Get(const std::string& path,
|
| ListValue* list = new ListValue();
|
| net::ProxyBypassRules::RuleList bypass_rules = config.bypass_rules.rules();
|
| for (size_t x = 0; x < bypass_rules.size(); x++) {
|
| - list->Append(Value::CreateStringValue(bypass_rules[x]->ToString()));
|
| + list->Append(base::StringValue::New(bypass_rules[x]->ToString()));
|
| }
|
| *out_value = list;
|
| return true;
|
| @@ -311,7 +311,7 @@ bool ProxyCrosSettingsProvider::Get(const std::string& path,
|
| if (found) {
|
| DictionaryValue* dict = new DictionaryValue;
|
| if (!data)
|
| - data = Value::CreateStringValue("");
|
| + data = base::StringValue::New("");
|
| dict->Set("value", data);
|
| dict->SetBoolean("managed", managed);
|
| *out_value = dict;
|
| @@ -364,14 +364,14 @@ net::ProxyServer ProxyCrosSettingsProvider::CreateProxyServerFromPort(
|
| Value* ProxyCrosSettingsProvider::CreateServerHostValue(
|
| const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy) const {
|
| return proxy.server.is_valid() ?
|
| - Value::CreateStringValue(proxy.server.host_port_pair().host()) :
|
| + base::StringValue::New(proxy.server.host_port_pair().host()) :
|
| NULL;
|
| }
|
|
|
| Value* ProxyCrosSettingsProvider::CreateServerPortValue(
|
| const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy) const {
|
| return proxy.server.is_valid() ?
|
| - Value::CreateIntegerValue(proxy.server.host_port_pair().port()) :
|
| + base::NumberValue::New(proxy.server.host_port_pair().port()) :
|
| NULL;
|
| }
|
|
|
|
|