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

chrome/browser/importer/firefox_proxy_settings.cc

Index: chrome/browser/importer/firefox_proxy_settings.cc
diff --git a/chrome/browser/importer/firefox_proxy_settings.cc b/chrome/browser/importer/firefox_proxy_settings.cc
index be2b2a8264d14ea210efef6adff1f20d73988a7d..2f522693913e5316894030fc124fed9df5a5927b 100644
--- a/chrome/browser/importer/firefox_proxy_settings.cc
+++ b/chrome/browser/importer/firefox_proxy_settings.cc
@@ -126,30 +126,34 @@ bool FirefoxProxySettings::ToProxyConfig(net::ProxyConfig* config) {
       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(