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

chrome/browser/importer/firefox_proxy_settings.cc

 // Copyright (c) 2010 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/importer/firefox_proxy_settings.h"
 
 #include "base/files/file_path.h"
 #include "base/string_util.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/values.h"
@@ skipping 108 matching lines @@
   }
 
   // The rest of this funciton is for handling the MANUAL case.
   DCHECK_EQ(MANUAL, config_type());
 
   *config = net::ProxyConfig();
   config->proxy_rules().type =
       net::ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME;
 
   if (!http_proxy().empty()) {
-    config->proxy_rules().proxy_for_http = net::ProxyServer(
-        net::ProxyServer::SCHEME_HTTP,
-        net::HostPortPair(http_proxy(), http_proxy_port()));
+    config->proxy_rules().proxies_for_http.SetSingleProxyServer(
+        net::ProxyServer(
+            net::ProxyServer::SCHEME_HTTP,
+            net::HostPortPair(http_proxy(), http_proxy_port())));
   }
 
   if (!ftp_proxy().empty()) {
-    config->proxy_rules().proxy_for_ftp = net::ProxyServer(
-        net::ProxyServer::SCHEME_HTTP,
-        net::HostPortPair(ftp_proxy(), ftp_proxy_port()));
+    config->proxy_rules().proxies_for_ftp.SetSingleProxyServer(
+        net::ProxyServer(
+            net::ProxyServer::SCHEME_HTTP,
+            net::HostPortPair(ftp_proxy(), ftp_proxy_port())));
   }
 
   if (!ssl_proxy().empty()) {
-    config->proxy_rules().proxy_for_https = net::ProxyServer(
-        net::ProxyServer::SCHEME_HTTP,
-        net::HostPortPair(ssl_proxy(), ssl_proxy_port()));
+    config->proxy_rules().proxies_for_https.SetSingleProxyServer(
+        net::ProxyServer(
+            net::ProxyServer::SCHEME_HTTP,
+            net::HostPortPair(ssl_proxy(), ssl_proxy_port())));
   }
 
   if (!socks_host().empty()) {
     net::ProxyServer::Scheme proxy_scheme = V5 == socks_version() ?
         net::ProxyServer::SCHEME_SOCKS5 : net::ProxyServer::SCHEME_SOCKS4;
 
-    config->proxy_rules().fallback_proxy = net::ProxyServer(
-        proxy_scheme,
-        net::HostPortPair(socks_host(), socks_port()));
+    config->proxy_rules().fallback_proxies.SetSingleProxyServer(
+        net::ProxyServer(
+            proxy_scheme,
+            net::HostPortPair(socks_host(), socks_port())));
   }
 
   config->proxy_rules().bypass_rules.ParseFromStringUsingSuffixMatching(
       JoinString(proxy_bypass_list_, ';'));
 
   return true;
 }
 
 // static
 bool FirefoxProxySettings::GetSettingsFromFile(const base::FilePath& pref_file,
@@ skipping 51 matching lines @@
       while (string_tok.GetNext()) {
         std::string token = string_tok.token();
         TrimWhitespaceASCII(token, TRIM_ALL, &token);
         if (!token.empty())
           settings->proxy_bypass_list_.push_back(token);
       }
     }
   }
   return true;
 }