Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / proxy_cros_settings_parser.cc

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 (file)
--- 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) {