Adds NetworkDelegate::NotifyBeforeSocketStreamConnect()

net/socket_stream/socket_stream.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.
 //
 // TODO(ukai): code is similar with http_network_transaction.cc.  We should
 //   think about ways to share code, if possible.
 
 #include "net/socket_stream/socket_stream.h"
 
 #include <set>
@@ skipping 45 matching lines @@
     : delegate_(delegate),
       url_(url),
       max_pending_send_allowed_(kMaxPendingSendAllowed),
       context_(NULL),
       next_state_(STATE_NONE),
       host_resolver_(NULL),
       cert_verifier_(NULL),
       server_bound_cert_service_(NULL),
       http_auth_handler_factory_(NULL),
       factory_(ClientSocketFactory::GetDefaultFactory()),
+      ALLOW_THIS_IN_INITIALIZER_LIST(before_connect_callback_(
+          base::Bind(&SocketStream::BeforeConnectComplete,
+                     base::Unretained(this)))),
       proxy_mode_(kDirectConnection),
       proxy_url_(url),
       pac_request_(NULL),
       // Unretained() is required; without it, Bind() creates a circular
       // dependency and the SocketStream object will not be freed.
       ALLOW_THIS_IN_INITIALIZER_LIST(
           io_callback_(base::Bind(&SocketStream::OnIOCompleted,
                                   base::Unretained(this)))),
       read_buf_(NULL),
       write_buf_(NULL),
@@ skipping 64 matching lines @@
       "The current MessageLoop must be TYPE_IO";
   if (context_) {
     ssl_config_service()->GetSSLConfig(&server_ssl_config_);
     proxy_ssl_config_ = server_ssl_config_;
   }
   DCHECK_EQ(next_state_, STATE_NONE);
 
   AddRef();  // Released in Finish()
   // Open a connection asynchronously, so that delegate won't be called
   // back before returning Connect().
-  next_state_ = STATE_RESOLVE_PROXY;
+  next_state_ = STATE_BEFORE_CONNECT;
   net_log_.BeginEvent(
       NetLog::TYPE_SOCKET_STREAM_CONNECT,
       make_scoped_refptr(
           new NetLogStringParameter("url", url_.possibly_invalid_spec())));
   MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&SocketStream::DoLoop, this, OK));
 }
 
 bool SocketStream::SendData(const char* data, int len) {
@@ skipping 242 matching lines @@
   if (!context_)
     next_state_ = STATE_CLOSE;
 
   if (next_state_ == STATE_NONE)
     return;
 
   do {
     State state = next_state_;
     next_state_ = STATE_NONE;
     switch (state) {
+      case STATE_BEFORE_CONNECT:
+        DCHECK_EQ(OK, result);
+        result = DoBeforeConnect();
+        break;
       case STATE_RESOLVE_PROXY:
         DCHECK_EQ(OK, result);
         result = DoResolveProxy();
         break;
       case STATE_RESOLVE_PROXY_COMPLETE:
         result = DoResolveProxyComplete(result);
         break;
       case STATE_RESOLVE_HOST:
         DCHECK_EQ(OK, result);
         result = DoResolveHost();
@@ skipping 81 matching lines @@
       continue;
     // If the connection is not established yet and had actual errors,
     // record the error.  In next iteration, it will close the connection.
     if (state != STATE_READ_WRITE && result < ERR_IO_PENDING) {
       net_log_.EndEventWithNetErrorCode(
           NetLog::TYPE_SOCKET_STREAM_CONNECT, result);
     }
   } while (result != ERR_IO_PENDING);
 }
 
+int SocketStream::DoBeforeConnect() {
+  next_state_ = STATE_RESOLVE_PROXY;
+  if (!context_ || !context_->network_delegate())
+    return OK;
+
+  int result = context_->network_delegate()->NotifyBeforeSocketStreamConnect(
+      this, before_connect_callback_);
+  if (result != OK && result != ERR_IO_PENDING)
+    next_state_ = STATE_CLOSE;
+
+  return result;
+}
+
 int SocketStream::DoResolveProxy() {
   DCHECK(!pac_request_);
   next_state_ = STATE_RESOLVE_PROXY_COMPLETE;
 
   if (!proxy_url_.is_valid()) {
     next_state_ = STATE_CLOSE;
     return ERR_INVALID_ARGUMENT;
   }
 
   // TODO(toyoshim): Check server advertisement of SPDY through the HTTP
@@ skipping 541 matching lines @@
       next_state_ = STATE_CLOSE;
       return result;
     }
     return result;
   }
 
   // We arrived here when both operation is pending.
   return ERR_IO_PENDING;
 }
 
+void SocketStream::BeforeConnectComplete(int result) {
+  DCHECK_NE(ERR_IO_PENDING, result);
+
+  if (result == OK)
+    next_state_ = STATE_RESOLVE_PROXY;
+  else
+    next_state_ = STATE_CLOSE;
+  DoLoop(result);
+}
+
 GURL SocketStream::ProxyAuthOrigin() const {
   DCHECK(!proxy_info_.is_empty());
   return GURL("http://" +
               proxy_info_.proxy_server().host_port_pair().ToString());
 }
 
 int SocketStream::HandleAuthChallenge(const HttpResponseHeaders* headers) {
   GURL auth_origin(ProxyAuthOrigin());
 
   VLOG(1) << "The proxy " << auth_origin << " requested auth";
@@ skipping 175 matching lines @@
 
 SSLConfigService* SocketStream::ssl_config_service() const {
   return context_->ssl_config_service();
 }
 
 ProxyService* SocketStream::proxy_service() const {
   return context_->proxy_service();
 }
 
 }  // namespace net