Cleanup QuicHttpStream to be a bit more consistent with net coding conventions.

net/quic/chromium/quic_http_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_QUIC_QUIC_HTTP_STREAM_H_
 #define NET_QUIC_QUIC_HTTP_STREAM_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 77 matching lines @@
   bool CheckVary(const SpdyHeaderBlock& client_request,
                  const SpdyHeaderBlock& promise_request,
                  const SpdyHeaderBlock& promise_response) override;
   void OnRendezvousResult(QuicSpdyStream* stream) override;
 
  private:
   friend class test::QuicHttpStreamPeer;
 
   enum State {
     STATE_NONE,
+    STATE_HANDLE_PROMISE,
+    STATE_HANDLE_PROMISE_COMPLETE,
     STATE_REQUEST_STREAM,
+    STATE_REQUEST_STREAM_COMPLETE,
     STATE_SET_REQUEST_PRIORITY,
     STATE_WAIT_FOR_CONFIRMATION,
     STATE_WAIT_FOR_CONFIRMATION_COMPLETE,
     STATE_SEND_HEADERS,
     STATE_SEND_HEADERS_COMPLETE,
     STATE_READ_REQUEST_BODY,
     STATE_READ_REQUEST_BODY_COMPLETE,
     STATE_SEND_BODY,
     STATE_SEND_BODY_COMPLETE,
     STATE_OPEN,
   };
 
-  void OnStreamReady(int rv);
   void OnIOComplete(int rv);
   void DoCallback(int rv);
 
   int DoLoop(int rv);
-  int DoStreamRequest();
+  int DoHandlePromise();
+  int DoHandlePromiseComplete(int rv);
+  int DoRequestStream();
+  int DoRequestStreamComplete(int rv);
   int DoSetRequestPriority();
   int DoWaitForConfirmation();
   int DoWaitForConfirmationComplete(int rv);
   int DoSendHeaders();
   int DoSendHeadersComplete(int rv);
   int DoReadRequestBody();
   int DoReadRequestBodyComplete(int rv);
   int DoSendBody();
   int DoSendBodyComplete(int rv);
 
   int ProcessResponseHeaders(const SpdyHeaderBlock& headers);
 
   int ReadAvailableData(IOBuffer* buf, int buf_len);
   void EnterStateSendHeaders();
-  int HandlePromise();
 
   void ResetStream();
   bool CancelPromiseIfHasBody();
 
   State next_state_;
 
   base::WeakPtr<QuicChromiumClientSession> session_;
   int session_error_;             // Error code from the connection shutdown.
   bool was_handshake_confirmed_;  // True if the crypto handshake succeeded.
   QuicChromiumClientSession::StreamRequest stream_request_;
@@ skipping 77 matching lines @@
   LoadTimingInfo::ConnectTiming connect_timing_;
 
   base::WeakPtrFactory<QuicHttpStream> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicHttpStream);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_HTTP_STREAM_H_