Update from https://crrev.com/312398

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 e1c938946749dee2a3419685e3687e9f6a9d634c..8e78d9f916fc42661d7a9f62924c04205496d8cf 100644
--- a/net/proxy/proxy_info.h
+++ b/net/proxy/proxy_info.h
@@ -29,25 +29,40 @@ class NET_EXPORT ProxyInfo {
   void Use(const ProxyInfo& proxy_info);
 
   // Uses a direct connection.
+  //
+  // Note that this method resets this instance unlike Fallback(), etc. which
+  // only modify |proxy_list_|. For example, since |config_id_| is cleared, the
+  // ProxyService may recognize this instance as a new config after UseDirect()
+  // call.
   void UseDirect();
 
   // Uses a direct connection. did_bypass_proxy() will return true to indicate
   // that the direct connection is the result of configured proxy bypass rules.
+  //
+  // See also the note for UseDirect().
   void UseDirectWithBypassedProxy();
 
   // Uses a specific proxy server, of the form:
   //   proxy-uri = [<scheme> "://"] <hostname> [":" <port>]
   // This may optionally be a semi-colon delimited list of <proxy-uri>.
   // It is OK to have LWS between entries.
+  //
+  // See also the note for UseDirect().
   void UseNamedProxy(const std::string& proxy_uri_list);
 
   // Sets the proxy list to a single entry, |proxy_server|.
+  //
+  // See also the note for UseDirect().
   void UseProxyServer(const ProxyServer& proxy_server);
 
   // Parses from the given PAC result.
+  //
+  // See also the note for UseDirect().
   void UsePacString(const std::string& pac_string);
 
   // Uses the proxies from the given list.
+  //
+  // See also the note for UseDirect().
   void UseProxyList(const ProxyList& proxy_list);
 
   // Uses the proxies from the given list, but does not otherwise reset the