Change ProxyRules to handle ProxyLists rather than just single ProxyServer instances.

chrome/browser/chromeos/proxy_config_service_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
 
 #include <ostream>
 
 #include "base/bind.h"
 #include "base/json/json_string_value_serializer.h"
@@ skipping 184 matching lines @@
       } else if (net_config.auto_detect()) {
         mode = ProxyConfig::MODE_AUTO_DETECT;
       } else if (net_config.has_pac_url()) {
         mode = ProxyConfig::MODE_PAC_SCRIPT;
         automatic_proxy.pac_url = net_config.pac_url();
       } else {
         return false;
       }
       return true;
     case net::ProxyConfig::ProxyRules::TYPE_SINGLE_PROXY:
-      if (!rules.single_proxy.is_valid())
+      if (rules.single_proxies.IsEmpty())
         return false;
       mode = MODE_SINGLE_PROXY;
-      single_proxy.server = rules.single_proxy;
+      single_proxy.server = rules.single_proxies.Get();
       bypass_rules = rules.bypass_rules;
       return true;
     case net::ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME:
       // Make sure we have valid server for at least one of the protocols.
-      if (!rules.proxy_for_http.is_valid() &&
-          !rules.proxy_for_https.is_valid() &&
-          !rules.proxy_for_ftp.is_valid() &&
-          !rules.fallback_proxy.is_valid()) {
+      if (rules.proxies_for_http.IsEmpty() &&
+          rules.proxies_for_https.IsEmpty() &&
+          rules.proxies_for_ftp.IsEmpty() &&
+          rules.fallback_proxies.IsEmpty()) {
         return false;
       }
       mode = MODE_PROXY_PER_SCHEME;
-      if (rules.proxy_for_http.is_valid())
-        http_proxy.server = rules.proxy_for_http;
-      if (rules.proxy_for_https.is_valid())
-        https_proxy.server = rules.proxy_for_https;
-      if (rules.proxy_for_ftp.is_valid())
-        ftp_proxy.server = rules.proxy_for_ftp;
-      if (rules.fallback_proxy.is_valid())
-        socks_proxy.server = rules.fallback_proxy;
+      if (!rules.proxies_for_http.IsEmpty())
+        http_proxy.server = rules.proxies_for_http.Get();
+      if (!rules.proxies_for_https.IsEmpty())
+        https_proxy.server = rules.proxies_for_https.Get();
+      if (!rules.proxies_for_ftp.IsEmpty())
+        ftp_proxy.server = rules.proxies_for_ftp.Get();
+      if (!rules.fallback_proxies.IsEmpty())
+        socks_proxy.server = rules.fallback_proxies.Get();
       bypass_rules = rules.bypass_rules;
       return true;
     default:
       NOTREACHED() << "Unrecognized proxy config mode";
       break;
   }
   return false;
 }
 
 DictionaryValue* ProxyConfigServiceImpl::ProxyConfig::ToPrefProxyConfig() {
@@ skipping 61 matching lines @@
     mode = MODE_PAC_SCRIPT;
     if (proxy_proto.has_proxy_pac_url())
       automatic_proxy.pac_url = GURL(proxy_proto.proxy_pac_url());
   } else if (mode_string == ProxyPrefs::kFixedServersProxyModeName) {
     net::ProxyConfig::ProxyRules rules;
     rules.ParseFromString(proxy_proto.proxy_server());
     switch (rules.type) {
       case net::ProxyConfig::ProxyRules::TYPE_NO_RULES:
         return false;
       case net::ProxyConfig::ProxyRules::TYPE_SINGLE_PROXY:
-        if (!rules.single_proxy.is_valid())
+        if (rules.single_proxies.IsEmpty())
           return false;
         mode = MODE_SINGLE_PROXY;
-        single_proxy.server = rules.single_proxy;
-        break;
+        single_proxy.server = rules.single_proxies.Get();
+        return true;
       case net::ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME:
         // Make sure we have valid server for at least one of the protocols.
-        if (!rules.proxy_for_http.is_valid() &&
-            !rules.proxy_for_https.is_valid() &&
-            !rules.proxy_for_ftp.is_valid() &&
-            !rules.fallback_proxy.is_valid()) {
+        if (rules.proxies_for_http.IsEmpty() &&
+            rules.proxies_for_https.IsEmpty() &&
+            rules.proxies_for_ftp.IsEmpty() &&
+            rules.fallback_proxies.IsEmpty()) {
           return false;
         }
         mode = MODE_PROXY_PER_SCHEME;
-        if (rules.proxy_for_http.is_valid())
-          http_proxy.server = rules.proxy_for_http;
-        if (rules.proxy_for_https.is_valid())
-          https_proxy.server = rules.proxy_for_https;
-        if (rules.proxy_for_ftp.is_valid())
-          ftp_proxy.server = rules.proxy_for_ftp;
-        if (rules.fallback_proxy.is_valid())
-          socks_proxy.server = rules.fallback_proxy;
+        if (!rules.proxies_for_http.IsEmpty())
+          http_proxy.server = rules.proxies_for_http.Get();
+        if (!rules.proxies_for_https.IsEmpty())
+          https_proxy.server = rules.proxies_for_https.Get();
+        if (!rules.proxies_for_ftp.IsEmpty())
+          ftp_proxy.server = rules.proxies_for_ftp.Get();
+        if (!rules.fallback_proxies.IsEmpty())
+          socks_proxy.server = rules.fallback_proxies.Get();
         break;
     }
   } else {
     NOTREACHED() << "Unrecognized proxy config mode";
     return false;
   }
 
   if (proxy_proto.has_proxy_bypass_list())
     bypass_rules.ParseFromString(proxy_proto.proxy_bypass_list());
 
@@ skipping 506 matching lines @@
     device_config_.clear();
     return;
   }
   if (!active_network_.empty()) {
     VLOG(1) << "Try migrating device config to " << active_network_;
     SetProxyConfigForNetwork(active_network_, device_config_, true);
   }
 }
 
 }  // namespace chromeos