Merge r25564 and r26588 from the trunk....

net/http/http_network_transaction.h

Index: net/http/http_network_transaction.h
===================================================================
--- net/http/http_network_transaction.h	(revision 28069)
+++ net/http/http_network_transaction.h	(working copy)
@@ -340,6 +340,11 @@
   // but it isn't really being used.
   bool reading_body_from_socket_;
 
+  // True if we've used the username/password embedded in the URL.  This
+  // makes sure we use the embedded identity only once for the transaction,
+  // preventing an infinite auth restart loop.
+  bool embedded_identity_used_;
+
   SSLConfig ssl_config_;
 
   scoped_refptr<RequestHeaders> request_headers_;