Update from https://crrev.com/311076

net/proxy/proxy_info.h

 // 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.
 
 #ifndef NET_PROXY_PROXY_INFO_H_
 #define NET_PROXY_PROXY_INFO_H_
 
 #include <string>
 
+#include "base/gtest_prod_util.h"
 #include "base/time/time.h"
 #include "net/base/net_export.h"
 #include "net/base/net_log.h"
 #include "net/proxy/proxy_config.h"
 #include "net/proxy/proxy_list.h"
 #include "net/proxy/proxy_retry_info.h"
 #include "net/proxy/proxy_server.h"
 
 namespace net {
 
@@ skipping 19 matching lines @@
   // This may optionally be a semi-colon delimited list of <proxy-uri>.
   // It is OK to have LWS between entries.
   void UseNamedProxy(const std::string& proxy_uri_list);
 
   // Sets the proxy list to a single entry, |proxy_server|.
   void UseProxyServer(const ProxyServer& proxy_server);
 
   // Parses from the given PAC result.
   void UsePacString(const std::string& pac_string);
 
-  // Use the proxies from the given list.
+  // Uses the proxies from the given list.
   void UseProxyList(const ProxyList& proxy_list);
 
+  // Uses the proxies from the given list, but does not otherwise reset the
+  // proxy configuration.
+  void OverrideProxyList(const ProxyList& proxy_list);
+
   // Returns true if this proxy info specifies a direct connection.
   bool is_direct() const {
     // We don't implicitly fallback to DIRECT unless it was added to the list.
     if (is_empty())
       return false;
     return proxy_list_.Get().is_direct();
   }
 
   bool is_direct_only() const {
     return is_direct() && proxy_list_.size() == 1 && proxy_retry_info_.empty();
@@ skipping 77 matching lines @@
   base::TimeTicks proxy_resolve_start_time() const {
     return proxy_resolve_start_time_;
   }
 
   base::TimeTicks proxy_resolve_end_time() const {
     return proxy_resolve_end_time_;
   }
 
  private:
   friend class ProxyService;
+  FRIEND_TEST_ALL_PREFIXES(ProxyInfoTest, UseVsOverrideProxyList);
 
   const ProxyRetryInfoMap& proxy_retry_info() const {
     return proxy_retry_info_;
   }
 
   // Reset proxy and config settings.
   void Reset();
 
   // The ordered list of proxy servers (including DIRECT attempts) remaining to
   // try. If proxy_list_ is empty, then there is nothing left to fall back to.
@@ skipping 16 matching lines @@
 
   // How long it took to resolve the proxy.  Times are both null if proxy was
   // determined synchronously without running a PAC.
   base::TimeTicks proxy_resolve_start_time_;
   base::TimeTicks proxy_resolve_end_time_;
 };
 
 }  // namespace net
 
 #endif  // NET_PROXY_PROXY_INFO_H_