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

net/proxy/proxy_list.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_list.h"
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/time.h"
@@ skipping 17 matching lines @@
     ProxyServer uri = ProxyServer::FromURI(
         str_tok.token_begin(), str_tok.token_end(), ProxyServer::SCHEME_HTTP);
     // Silently discard malformed inputs.
     if (uri.is_valid())
       proxies_.push_back(uri);
   }
 }
 
 void ProxyList::SetSingleProxyServer(const ProxyServer& proxy_server) {
   proxies_.clear();
+  AddProxyServer(proxy_server);
+}
+
+void ProxyList::AddProxyServer(const ProxyServer& proxy_server) {
   if (proxy_server.is_valid())
     proxies_.push_back(proxy_server);
 }
 
 void ProxyList::DeprioritizeBadProxies(
     const ProxyRetryInfoMap& proxy_retry_info) {
   // Partition the proxy list in two:
   //   (1) the known bad proxies
   //   (2) everything else
   std::vector<ProxyServer> good_proxies;
@@ skipping 55 matching lines @@
 }
 
 bool ProxyList::IsEmpty() const {
   return proxies_.empty();
 }
 
 size_t ProxyList::size() const {
   return proxies_.size();
 }
 
+// Returns true if |*this| lists the same proxies as |other|.
+bool ProxyList::Equals(const ProxyList& other) const {
+  if (size() != other.size())
+    return false;
+  return ToPacString() == other.ToPacString();

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

Not ideal. I will allow it though.

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

ProxyServer has an == operator, so I can just compare the vectors directly.

+}
+
 const ProxyServer& ProxyList::Get() const {
   DCHECK(!proxies_.empty());
   return proxies_[0];
 }
 
 void ProxyList::SetFromPacString(const std::string& pac_string) {
   base::StringTokenizer entry_tok(pac_string, ";");
   proxies_.clear();
   while (entry_tok.GetNext()) {
     ProxyServer uri = ProxyServer::FromPacString(
@@ skipping 76 matching lines @@
       retry_info.current_delay = kProxyRetryDelay;
       retry_info.bad_until = TimeTicks().Now() + retry_info.current_delay;
       (*proxy_retry_info)[key] = retry_info;
     }
     net_log.AddEvent(NetLog::TYPE_PROXY_LIST_FALLBACK,
                      NetLog::StringCallback("bad_proxy", &key));
   }
 }
 
 }  // namespace net