Adds NetworkDelegate::NotifyBeforeSocketStreamConnect()

net/socket_stream/socket_stream.h

Index: net/socket_stream/socket_stream.h
diff --git a/net/socket_stream/socket_stream.h b/net/socket_stream/socket_stream.h
index 35d23120f5fe9535dfce4c3a7900777f21227def..b8267e231ce5c0089e115bc4dc69068d75da2389 100644
--- a/net/socket_stream/socket_stream.h
+++ b/net/socket_stream/socket_stream.h
@@ -25,6 +25,7 @@
 #include "net/http/http_auth_handler.h"
 #include "net/proxy/proxy_service.h"
 #include "net/socket/tcp_client_socket.h"
+#include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 
 namespace net {
@@ -231,6 +232,7 @@ class NET_EXPORT SocketStream
 
   enum State {
     STATE_NONE,
+    STATE_BEFORE_CONNECT,
     STATE_RESOLVE_PROXY,
     STATE_RESOLVE_PROXY_COMPLETE,
     STATE_RESOLVE_HOST,
@@ -287,6 +289,7 @@ class NET_EXPORT SocketStream
 
   void DoLoop(int result);
 
+  int DoBeforeConnect();
   int DoResolveProxy();
   int DoResolveProxyComplete(int result);
   int DoResolveHost();
@@ -311,6 +314,8 @@ class NET_EXPORT SocketStream
   int DoSSLHandleCertErrorComplete(int result);
   int DoReadWrite(int result);
 
+  void BeforeConnectComplete(int result);

[willchan no longer on Chromium, 2012/06/07 23:07:07]

Please follow the existing convention. Pass the io_callback_ instead of creating
a new before_connect_callback_, and rename this to DoBeforeConnectComplete().

I'm also not fond of the name of DoBeforeConnect(), but I don't have a better
suggestion :P

[bashi, 2012/06/08 02:48:33]

Done.

+
   GURL ProxyAuthOrigin() const;
   int HandleAuthChallenge(const HttpResponseHeaders* headers);
   int HandleCertificateRequest(int result);
@@ -338,6 +343,8 @@ class NET_EXPORT SocketStream
   HttpAuthHandlerFactory* http_auth_handler_factory_;
   ClientSocketFactory* factory_;
 
+  CompletionCallback before_connect_callback_;
+
   ProxyMode proxy_mode_;
 
   GURL proxy_url_;