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

net/proxy/proxy_config_service_common_unittest.cc

Index: net/proxy/proxy_config_service_common_unittest.cc
diff --git a/net/proxy/proxy_config_service_common_unittest.cc b/net/proxy/proxy_config_service_common_unittest.cc
index 429abc560b86bed3ee1862b1124574c640c18a79..f265307ba817ae6263e768dbe658a6e5b58fb043 100644
--- a/net/proxy/proxy_config_service_common_unittest.cc
+++ b/net/proxy/proxy_config_service_common_unittest.cc
@@ -81,13 +81,13 @@ ProxyRulesExpectation::ProxyRulesExpectation(
   }
 
   MatchesProxyServerHelper("Bad single_proxy", single_proxy,
-                           rules.single_proxy, &failure_details, &failed);
+                           rules.single_proxy.Get(), &failure_details, &failed);

[eroman, 2013/02/26 01:13:50]

It seems it would be appropriate to change the expectations here to a PAC style
string similar to what you did in the proxy_config_unitest.cc.  That may cause
lots of other updates.

At a minimum please assert that the list size is 1 here, since that is important
for correctness of the test verification (whereas changing to PAC strings is
about flexibility).

[marq_use_my_chromium_address, 2013/02/27 23:08:19]

Done.

   MatchesProxyServerHelper("Bad proxy_for_http", proxy_for_http,
-                           rules.proxy_for_http, &failure_details, &failed);
+                           rules.proxy_for_http.Get(), &failure_details,
+                           &failed);
   MatchesProxyServerHelper("Bad proxy_for_https", proxy_for_https,
-                           rules.proxy_for_https, &failure_details, &failed);
-  MatchesProxyServerHelper("Bad fallback_proxy", fallback_proxy,
-                           rules.fallback_proxy, &failure_details, &failed);
+                           rules.proxy_for_https.Get(), &failure_details,
+                           &failed);
 
   std::string actual_flattened_bypass = FlattenProxyBypass(rules.bypass_rules);
   if (std::string(flattened_bypass_rules) != actual_flattened_bypass) {