| Index: chrome/browser/chromeos/proxy_cros_settings_parser.cc
|
| diff --git a/chrome/browser/chromeos/proxy_cros_settings_parser.cc b/chrome/browser/chromeos/proxy_cros_settings_parser.cc
|
| index 73b5205379fabe2221425c225cce4f1f847251a8..0f9be54060bca7ee1a6cc8d711bea1798e73a149 100644
|
| --- a/chrome/browser/chromeos/proxy_cros_settings_parser.cc
|
| +++ b/chrome/browser/chromeos/proxy_cros_settings_parser.cc
|
| @@ -62,9 +62,9 @@ base::Value* CreateServerHostValue(const UIProxyConfig::ManualProxy& proxy) {
|
| }
|
|
|
| base::Value* CreateServerPortValue(const UIProxyConfig::ManualProxy& proxy) {
|
| - return proxy.server.is_valid() ?
|
| - base::Value::CreateIntegerValue(proxy.server.host_port_pair().port()) :
|
| - NULL;
|
| + return proxy.server.is_valid()
|
| + ? new base::FundamentalValue(proxy.server.host_port_pair().port())
|
| + : NULL;
|
| }
|
|
|
| net::ProxyServer CreateProxyServer(std::string host,
|
| @@ -310,12 +310,12 @@ bool GetProxyPrefValue(const UIProxyConfigService& config_service,
|
| } else if (path == kProxyType) {
|
| if (config.mode == UIProxyConfig::MODE_AUTO_DETECT ||
|
| config.mode == UIProxyConfig::MODE_PAC_SCRIPT) {
|
| - data = base::Value::CreateIntegerValue(3);
|
| + data = new base::FundamentalValue(3);
|
| } else if (config.mode == UIProxyConfig::MODE_SINGLE_PROXY ||
|
| config.mode == UIProxyConfig::MODE_PROXY_PER_SCHEME) {
|
| - data = base::Value::CreateIntegerValue(2);
|
| + data = new base::FundamentalValue(2);
|
| } else {
|
| - data = base::Value::CreateIntegerValue(1);
|
| + data = new base::FundamentalValue(1);
|
| }
|
| switch (config.state) {
|
| case ProxyPrefs::CONFIG_POLICY:
|
|
|