Use net::UploadDataStream::Init() instead of InitSync()

net/http/http_network_transaction.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.
 
 #include "net/http/http_network_transaction.h"
 
 #include <set>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 516 matching lines @@
       case STATE_GENERATE_PROXY_AUTH_TOKEN_COMPLETE:
         rv = DoGenerateProxyAuthTokenComplete(rv);
         break;
       case STATE_GENERATE_SERVER_AUTH_TOKEN:
         DCHECK_EQ(OK, rv);
         rv = DoGenerateServerAuthToken();
         break;
       case STATE_GENERATE_SERVER_AUTH_TOKEN_COMPLETE:
         rv = DoGenerateServerAuthTokenComplete(rv);
         break;
+      case STATE_INIT_REQUEST_BODY:
+        DCHECK_EQ(OK, rv);
+        rv = DoInitRequestBody();
+        break;
+      case STATE_INIT_REQUEST_BODY_COMPLETE:
+        rv = DoInitRequestBodyComplete(rv);
+        break;
       case STATE_BUILD_REQUEST:
         DCHECK_EQ(OK, rv);
         net_log_.BeginEvent(NetLog::TYPE_HTTP_TRANSACTION_SEND_REQUEST);
         rv = DoBuildRequest();
         break;
       case STATE_BUILD_REQUEST_COMPLETE:
         rv = DoBuildRequestComplete(rv);
         break;
       case STATE_SEND_REQUEST:
         DCHECK_EQ(OK, rv);
@@ skipping 135 matching lines @@
   if (!ShouldApplyServerAuth())
     return OK;
   return auth_controllers_[target]->MaybeGenerateAuthToken(request_,
                                                            io_callback_,
                                                            net_log_);
 }
 
 int HttpNetworkTransaction::DoGenerateServerAuthTokenComplete(int rv) {
   DCHECK_NE(ERR_IO_PENDING, rv);
   if (rv == OK)
-    next_state_ = STATE_BUILD_REQUEST;
+    next_state_ = STATE_INIT_REQUEST_BODY;
   return rv;
 }
 
 void HttpNetworkTransaction::BuildRequestHeaders(bool using_proxy) {
   request_headers_.SetHeader(HttpRequestHeaders::kHost,
                              GetHostAndOptionalPort(request_->url));
 
   // For compat with HTTP/1.0 servers and proxies:
   if (using_proxy) {
     request_headers_.SetHeader(HttpRequestHeaders::kProxyConnection,
@@ skipping 32 matching lines @@
   if (ShouldApplyProxyAuth() && HaveAuth(HttpAuth::AUTH_PROXY))
     auth_controllers_[HttpAuth::AUTH_PROXY]->AddAuthorizationHeader(
         &request_headers_);
   if (ShouldApplyServerAuth() && HaveAuth(HttpAuth::AUTH_SERVER))
     auth_controllers_[HttpAuth::AUTH_SERVER]->AddAuthorizationHeader(
         &request_headers_);
 
   request_headers_.MergeFrom(request_->extra_headers);
 }
 
+int HttpNetworkTransaction::DoInitRequestBody() {
+  next_state_ = STATE_INIT_REQUEST_BODY_COMPLETE;
+  request_body_.reset(NULL);
+  int error_code = OK;

[eroman, 2012/08/08 19:06:01]

nit: for consistency you may want to call this  |rv|.

[hashimoto, 2012/08/09 04:35:20]

Done.

+  if (request_->upload_data) {
+    request_body_.reset(new UploadDataStream(request_->upload_data));
+    error_code = request_body_->Init(io_callback_);
+    if (error_code != OK && error_code != ERR_IO_PENDING)
+      request_body_.reset(NULL);

[eroman, 2012/08/08 19:06:01]

You can remove this: it will already be reset by DoInitRequestBodyComplete()

[hashimoto, 2012/08/09 04:35:20]

Done.

+  }
+  return error_code;
+}
+
+int HttpNetworkTransaction::DoInitRequestBodyComplete(int result) {
+  if (result == OK)
+    next_state_ = STATE_BUILD_REQUEST;
+  else
+    request_body_.reset(NULL);
+  return result;
+}
+
 int HttpNetworkTransaction::DoBuildRequest() {
   next_state_ = STATE_BUILD_REQUEST_COMPLETE;
-  request_body_.reset(NULL);
-  if (request_->upload_data) {
-    request_body_.reset(new UploadDataStream(request_->upload_data));
-    const int error_code = request_body_->InitSync();
-    if (error_code != OK) {
-      request_body_.reset(NULL);
-      return error_code;
-    }
-  }
-
   headers_valid_ = false;
 
   // This is constructed lazily (instead of within our Start method), so that
   // we have proxy info available.
   if (request_headers_.IsEmpty()) {
     bool using_proxy = (proxy_info_.is_http() || proxy_info_.is_https()) &&
                         !is_https_request();
     BuildRequestHeaders(using_proxy);
   }
 
@@ skipping 620 matching lines @@
 #define STATE_CASE(s) \
   case s: \
     description = base::StringPrintf("%s (0x%08X)", #s, s); \
     break
 
 std::string HttpNetworkTransaction::DescribeState(State state) {
   std::string description;
   switch (state) {
     STATE_CASE(STATE_CREATE_STREAM);
     STATE_CASE(STATE_CREATE_STREAM_COMPLETE);
+    STATE_CASE(STATE_INIT_REQUEST_BODY);
+    STATE_CASE(STATE_INIT_REQUEST_BODY_COMPLETE);
     STATE_CASE(STATE_BUILD_REQUEST);
     STATE_CASE(STATE_BUILD_REQUEST_COMPLETE);
     STATE_CASE(STATE_SEND_REQUEST);
     STATE_CASE(STATE_SEND_REQUEST_COMPLETE);
     STATE_CASE(STATE_READ_HEADERS);
     STATE_CASE(STATE_READ_HEADERS_COMPLETE);
     STATE_CASE(STATE_READ_BODY);
     STATE_CASE(STATE_READ_BODY_COMPLETE);
     STATE_CASE(STATE_DRAIN_BODY_FOR_AUTH_RESTART);
     STATE_CASE(STATE_DRAIN_BODY_FOR_AUTH_RESTART_COMPLETE);
     STATE_CASE(STATE_NONE);
     default:
       description = base::StringPrintf("Unknown state 0x%08X (%u)", state,
                                        state);
       break;
   }
   return description;
 }
 
 #undef STATE_CASE
 
 }  // namespace net