Change the proxy waiting-for message to:

    "Waiting for proxy tunnel..."
Add a message for waiting for the SSL Handshake to complete:
    "Establishing secure connection..."
Also make the waiting messages work for SPDY connections.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/2262003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48430 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 9 insertions, 0 deletions

diff --git a/net/base/load_states.h b/net/base/load_states.h
index cce9781..321dee8 100644
--- a/net/base/load_states.h
+++ b/net/base/load_states.h
@@ -44,6 +44,10 @@ enum LoadState {
   // requests that reuse a keep-alive connection skip this state.
   LOAD_STATE_CONNECTING,
 
+  // This state corresponds to a resource load that is blocked waiting for the
+  // SSL handshake to complete.
+  LOAD_STATE_SSL_HANDSHAKE,
+
   // This state corresponds to a resource load that is blocked waiting to
   // completely upload a request to a server.  In the case of a HTTP POST
   // request, this state includes the period of time during which the message
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index 8a4f486..0ecb180 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -557,11 +557,16 @@ LoadState HttpNetworkTransaction::GetLoadState() const {
     case STATE_TUNNEL_SEND_REQUEST_COMPLETE:
     case STATE_TUNNEL_READ_HEADERS_COMPLETE:
       return LOAD_STATE_ESTABLISHING_PROXY_TUNNEL;
+    case STATE_SSL_CONNECT_COMPLETE:
+      return LOAD_STATE_SSL_HANDSHAKE;
     case STATE_SEND_REQUEST_COMPLETE:
+    case STATE_SPDY_SEND_REQUEST_COMPLETE:
       return LOAD_STATE_SENDING_REQUEST;
     case STATE_READ_HEADERS_COMPLETE:
+    case STATE_SPDY_READ_HEADERS_COMPLETE:
       return LOAD_STATE_WAITING_FOR_RESPONSE;
     case STATE_READ_BODY_COMPLETE:
+    case STATE_SPDY_READ_BODY_COMPLETE:
       return LOAD_STATE_READING_RESPONSE;
     default:
       return LOAD_STATE_IDLE;