Adds NetworkDelegate::NotifyBeforeSocketStreamConnect()

net/socket_stream/socket_stream.h

 // 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.
 
 #ifndef NET_SOCKET_STREAM_SOCKET_STREAM_H_
 #define NET_SOCKET_STREAM_SOCKET_STREAM_H_
 #pragma once
 
 #include <deque>
 #include <map>
 #include <string>
 
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/address_list.h"
 #include "net/base/completion_callback.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_export.h"
 #include "net/base/net_log.h"
 #include "net/base/net_errors.h"
 #include "net/base/ssl_config_service.h"
 #include "net/http/http_auth.h"
 #include "net/http/http_auth_cache.h"
 #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 {
 
 class AuthChallengeInfo;
 class ClientSocketFactory;
 class CookieOptions;
 class HostResolver;
 class HttpAuthHandlerFactory;
 class SSLConfigService;
@@ skipping 186 matching lines @@
     void Realloc(size_t new_size);
 
    private:
      virtual ~ResponseHeaders();
 
     scoped_ptr_malloc<char> headers_;
   };
 
   enum State {
     STATE_NONE,
+    STATE_BEFORE_CONNECT,
     STATE_RESOLVE_PROXY,
     STATE_RESOLVE_PROXY_COMPLETE,
     STATE_RESOLVE_HOST,
     STATE_RESOLVE_HOST_COMPLETE,
     STATE_RESOLVE_PROTOCOL,
     STATE_RESOLVE_PROTOCOL_COMPLETE,
     STATE_TCP_CONNECT,
     STATE_TCP_CONNECT_COMPLETE,
     STATE_WRITE_TUNNEL_HEADERS,
     STATE_WRITE_TUNNEL_HEADERS_COMPLETE,
@@ skipping 36 matching lines @@
   int DidEstablishConnection();
   int DidReceiveData(int result);
   int DidSendData(int result);
 
   void OnIOCompleted(int result);
   void OnReadCompleted(int result);
   void OnWriteCompleted(int result);
 
   void DoLoop(int result);
 
+  int DoBeforeConnect();
   int DoResolveProxy();
   int DoResolveProxyComplete(int result);
   int DoResolveHost();
   int DoResolveHostComplete(int result);
   int DoResolveProtocol(int result);
   int DoResolveProtocolComplete(int result);
   int DoTcpConnect(int result);
   int DoTcpConnectComplete(int result);
   int DoWriteTunnelHeaders();
   int DoWriteTunnelHeadersComplete(int result);
   int DoReadTunnelHeaders();
   int DoReadTunnelHeadersComplete(int result);
   int DoSOCKSConnect();
   int DoSOCKSConnectComplete(int result);
   int DoSecureProxyConnect();
   int DoSecureProxyConnectComplete(int result);
   int DoSecureProxyHandleCertError(int result);
   int DoSecureProxyHandleCertErrorComplete(int result);
   int DoSSLConnect();
   int DoSSLConnectComplete(int result);
   int DoSSLHandleCertError(int result);
   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);
   void DoAuthRequired();
   void DoRestartWithAuth();
 
   int HandleCertificateError(int result);
   int AllowCertErrorForReconnection(SSLConfig* ssl_config);
 
   SSLConfigService* ssl_config_service() const;
   ProxyService* proxy_service() const;
 
   BoundNetLog net_log_;
 
   GURL url_;
   int max_pending_send_allowed_;
   const URLRequestContext* context_;
 
   UserDataMap user_data_;
 
   State next_state_;
   HostResolver* host_resolver_;
   CertVerifier* cert_verifier_;
   ServerBoundCertService* server_bound_cert_service_;
   HttpAuthHandlerFactory* http_auth_handler_factory_;
   ClientSocketFactory* factory_;
 
+  CompletionCallback before_connect_callback_;
+
   ProxyMode proxy_mode_;
 
   GURL proxy_url_;
   ProxyService::PacRequest* pac_request_;
   ProxyInfo proxy_info_;
 
   HttpAuthCache auth_cache_;
   scoped_ptr<HttpAuthHandler> auth_handler_;
   HttpAuth::Identity auth_identity_;
   scoped_refptr<AuthChallengeInfo> auth_info_;
@@ skipping 32 matching lines @@
   bool server_closed_;
 
   scoped_ptr<SocketStreamMetrics> metrics_;
 
   DISALLOW_COPY_AND_ASSIGN(SocketStream);
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_STREAM_SOCKET_STREAM_H_