Update from https://crrev.com/311076

net/proxy/proxy_info.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_info.h"
 
 #include "net/proxy/proxy_retry_info.h"
 
 namespace net {
 
@@ skipping 41 matching lines @@
 void ProxyInfo::UsePacString(const std::string& pac_string) {
   Reset();
   proxy_list_.SetFromPacString(pac_string);
 }
 
 void ProxyInfo::UseProxyList(const ProxyList& proxy_list) {
   Reset();
   proxy_list_ = proxy_list;
 }
 
+void ProxyInfo::OverrideProxyList(const ProxyList& proxy_list) {
+  proxy_list_ = proxy_list;
+}
+
 std::string ProxyInfo::ToPacString() const {
   return proxy_list_.ToPacString();
 }
 
 bool ProxyInfo::Fallback(int net_error, const BoundNetLog& net_log) {
   return proxy_list_.Fallback(&proxy_retry_info_, net_error, net_log);
 }
 
 void ProxyInfo::DeprioritizeBadProxies(
     const ProxyRetryInfoMap& proxy_retry_info) {
   proxy_list_.DeprioritizeBadProxies(proxy_retry_info);
 }
 
 void ProxyInfo::RemoveProxiesWithoutScheme(int scheme_bit_field) {
   proxy_list_.RemoveProxiesWithoutScheme(scheme_bit_field);
 }
 
 void ProxyInfo::Reset() {
   proxy_resolve_start_time_ = base::TimeTicks();
   proxy_resolve_end_time_ = base::TimeTicks();
   proxy_list_.Clear();
   proxy_retry_info_.clear();
   config_id_ = ProxyConfig::kInvalidConfigID;
   config_source_ = PROXY_CONFIG_SOURCE_UNKNOWN;
   did_bypass_proxy_ = false;
   did_use_pac_script_ = false;
 }
 
 }  // namespace net