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

net/proxy/proxy_config_service_mac.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 "net/proxy/proxy_config_service_mac.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <SystemConfiguration/SystemConfiguration.h>
 
 #include "base/bind.h"
@@ skipping 62 matching lines @@
                             kSCPropNetProxiesFTPEnable,
                             false)) {
     ProxyServer proxy_server =
         ProxyServer::FromDictionary(ProxyServer::SCHEME_HTTP,
                                     config_dict.get(),
                                     kSCPropNetProxiesFTPProxy,
                                     kSCPropNetProxiesFTPPort);
     if (proxy_server.is_valid()) {
       config->proxy_rules().type =
           ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME;
-      config->proxy_rules().proxy_for_ftp = proxy_server;
+      config->proxy_rules().proxies_for_ftp.SetSingleProxyServer(proxy_server);
     }
   }
   if (GetBoolFromDictionary(config_dict.get(),
                             kSCPropNetProxiesHTTPEnable,
                             false)) {
     ProxyServer proxy_server =
         ProxyServer::FromDictionary(ProxyServer::SCHEME_HTTP,
                                     config_dict.get(),
                                     kSCPropNetProxiesHTTPProxy,
                                     kSCPropNetProxiesHTTPPort);
     if (proxy_server.is_valid()) {
       config->proxy_rules().type =
           ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME;
-      config->proxy_rules().proxy_for_http = proxy_server;
+      config->proxy_rules().proxies_for_http.SetSingleProxyServer(proxy_server);
     }
   }
   if (GetBoolFromDictionary(config_dict.get(),
                             kSCPropNetProxiesHTTPSEnable,
                             false)) {
     ProxyServer proxy_server =
         ProxyServer::FromDictionary(ProxyServer::SCHEME_HTTP,
                                     config_dict.get(),
                                     kSCPropNetProxiesHTTPSProxy,
                                     kSCPropNetProxiesHTTPSPort);
     if (proxy_server.is_valid()) {
       config->proxy_rules().type =
           ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME;
-      config->proxy_rules().proxy_for_https = proxy_server;
+      config->proxy_rules().proxies_for_https.
+          SetSingleProxyServer(proxy_server);
     }
   }
   if (GetBoolFromDictionary(config_dict.get(),
                             kSCPropNetProxiesSOCKSEnable,
                             false)) {
     ProxyServer proxy_server =
         ProxyServer::FromDictionary(ProxyServer::SCHEME_SOCKS5,
                                     config_dict.get(),
                                     kSCPropNetProxiesSOCKSProxy,
                                     kSCPropNetProxiesSOCKSPort);
     if (proxy_server.is_valid()) {
       config->proxy_rules().type =
           ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME;
-      config->proxy_rules().fallback_proxy = proxy_server;
+      config->proxy_rules().fallback_proxies.SetSingleProxyServer(proxy_server);
     }
   }
 
   // proxy bypass list
 
   CFArrayRef bypass_array_ref = base::mac::GetValueFromDictionary<CFArrayRef>(
       config_dict.get(), kSCPropNetProxiesExceptionsList);
   if (bypass_array_ref) {
     CFIndex bypass_array_count = CFArrayGetCount(bypass_array_ref);
     for (CFIndex i = 0; i < bypass_array_count; ++i) {
@@ skipping 140 matching lines @@
   // Keep track of the last value we have seen.
   has_fetched_config_ = true;
   last_config_fetched_ = new_config;
 
   // Notify all the observers.
   FOR_EACH_OBSERVER(Observer, observers_,
                     OnProxyConfigChanged(new_config, CONFIG_VALID));
 }
 
 }  // namespace net