X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fbrowser%2Fchromeos%2Fproxy_cros_settings_parser.cc;h=0f9be54060bca7ee1a6cc8d711bea1798e73a149;hb=4a1a0bdd01eef90b0826a0e761d3379d3715c10f;hp=581aeb718facf56fff897460ab5e9351fc483b18;hpb=b1be5ca53587d23e7aeb77b26861fdc0a181ffd8;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/chrome/browser/chromeos/proxy_cros_settings_parser.cc b/src/chrome/browser/chromeos/proxy_cros_settings_parser.cc index 581aeb7..0f9be54 100644 --- a/src/chrome/browser/chromeos/proxy_cros_settings_parser.cc +++ b/src/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: @@ -333,11 +333,11 @@ bool GetProxyPrefValue(const UIProxyConfigService& config_service, break; } } else if (path == kProxySingle) { - data = base::Value::CreateBooleanValue( - config.mode == UIProxyConfig::MODE_SINGLE_PROXY); + data = new base::FundamentalValue(config.mode == + UIProxyConfig::MODE_SINGLE_PROXY); } else if (path == kProxyUsePacUrl) { - data = base::Value::CreateBooleanValue( - config.mode == UIProxyConfig::MODE_PAC_SCRIPT); + data = new base::FundamentalValue(config.mode == + UIProxyConfig::MODE_PAC_SCRIPT); } else if (path == kProxyFtpUrl) { data = CreateServerHostValue(config.ftp_proxy); } else if (path == kProxySocks) {