Update from https://crrev.com/311076

net/proxy/proxy_info.h

Index: net/proxy/proxy_info.h
diff --git a/net/proxy/proxy_info.h b/net/proxy/proxy_info.h
index 8424c51fa2d03043ed2ecd4b4d1e601eb6548808..e1c938946749dee2a3419685e3687e9f6a9d634c 100644
--- a/net/proxy/proxy_info.h
+++ b/net/proxy/proxy_info.h
@@ -7,6 +7,7 @@
 
 #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"
@@ -46,9 +47,13 @@ class NET_EXPORT ProxyInfo {
   // 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.
@@ -146,6 +151,7 @@ class NET_EXPORT ProxyInfo {
 
  private:
   friend class ProxyService;
+  FRIEND_TEST_ALL_PREFIXES(ProxyInfoTest, UseVsOverrideProxyList);
 
   const ProxyRetryInfoMap& proxy_retry_info() const {
     return proxy_retry_info_;