Remove callback argument from HttpBasicState::Initialize().

HttpBasicState::Initialize() always succeeds, so remove callback
argument and change return type to void.

Why convert CompletionCallback to CompletionOnceCallback if one can
safely remove it instead?  :)

Bug: 807724
Change-Id: I16244d0600a278139ba2e112373f95933245a1b2
Reviewed-on: https://chromium-review.googlesource.com/908635Reviewed-by: Eric Roman <eroman@chromium.org>
Commit-Queue: Bence Béky <bnc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#535997}

net/http/http_basic_state.cc

@@ -32,11 +32,10 @@ HttpBasicState::HttpBasicState(std::unique_ptr<ClientSocketHandle> connection,
 
 HttpBasicState::~HttpBasicState() = default;
 
-int HttpBasicState::Initialize(const HttpRequestInfo* request_info,
-                               bool can_send_early,
-                               RequestPriority priority,
-                               const NetLogWithSource& net_log,
-                               const CompletionCallback& callback) {
+void HttpBasicState::Initialize(const HttpRequestInfo* request_info,
+                                bool can_send_early,
+                                RequestPriority priority,
+                                const NetLogWithSource& net_log) {
   DCHECK(!parser_.get());
   url_ = request_info->url;
   request_method_ = request_info->method;
@@ -45,7 +44,6 @@ int HttpBasicState::Initialize(const HttpRequestInfo* request_info,
   parser_->set_http_09_on_non_default_ports_enabled(
       http_09_on_non_default_ports_enabled_);
   can_send_early_ = can_send_early;
-  return OK;
 }
 
 std::unique_ptr<ClientSocketHandle> HttpBasicState::ReleaseConnection() {

net/http/http_basic_state.h

@@ -13,7 +13,6 @@
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "net/base/completion_callback.h"
 #include "net/base/net_export.h"
 #include "net/base/request_priority.h"
 #include "url/gurl.h"
@@ -34,11 +33,10 @@ class NET_EXPORT_PRIVATE HttpBasicState {
   ~HttpBasicState();
 
   // Initialize() must be called before using any of the other methods.
-  int Initialize(const HttpRequestInfo* request_info,
-                 bool can_send_early,
-                 RequestPriority priority,
-                 const NetLogWithSource& net_log,
-                 const CompletionCallback& callback);
+  void Initialize(const HttpRequestInfo* request_info,
+                  bool can_send_early,
+                  RequestPriority priority,
+                  const NetLogWithSource& net_log);
 
   HttpStreamParser* parser() const { return parser_.get(); }
 

net/http/http_basic_state_unittest.cc

@@ -5,7 +5,6 @@
 #include "net/http/http_basic_state.h"
 
 #include "base/memory/ptr_util.h"
-#include "net/base/completion_callback.h"
 #include "net/base/request_priority.h"
 #include "net/http/http_request_info.h"
 #include "net/log/net_log_with_source.h"
@@ -46,16 +45,14 @@ TEST(HttpBasicStateTest, ReleaseConnectionWorks) {
 TEST(HttpBasicStateTest, InitializeWorks) {
   HttpBasicState state(std::make_unique<ClientSocketHandle>(), false, false);
   const HttpRequestInfo request_info;
-  EXPECT_EQ(OK, state.Initialize(&request_info, false, LOW, NetLogWithSource(),
-                                 CompletionCallback()));
+  state.Initialize(&request_info, false, LOW, NetLogWithSource());
   EXPECT_TRUE(state.parser());
 }
 
 TEST(HttpBasicStateTest, DeleteParser) {
   HttpBasicState state(std::make_unique<ClientSocketHandle>(), false, false);
   const HttpRequestInfo request_info;
-  state.Initialize(&request_info, false, LOW, NetLogWithSource(),
-                   CompletionCallback());
+  state.Initialize(&request_info, false, LOW, NetLogWithSource());
   EXPECT_TRUE(state.parser());
   state.DeleteParser();
   EXPECT_EQ(NULL, state.parser());
@@ -68,8 +65,7 @@ TEST(HttpBasicStateTest, GenerateRequestLineNoProxy) {
   HttpRequestInfo request_info;
   request_info.url = GURL("http://www.example.com/path?foo=bar#hoge");
   request_info.method = "PUT";
-  state.Initialize(&request_info, false, LOW, NetLogWithSource(),
-                   CompletionCallback());
+  state.Initialize(&request_info, false, LOW, NetLogWithSource());
   EXPECT_EQ("PUT /path?foo=bar HTTP/1.1\r\n", state.GenerateRequestLine());
 }
 
@@ -80,8 +76,7 @@ TEST(HttpBasicStateTest, GenerateRequestLineWithProxy) {
   HttpRequestInfo request_info;
   request_info.url = GURL("http://www.example.com/path?foo=bar#hoge");
   request_info.method = "PUT";
-  state.Initialize(&request_info, false, LOW, NetLogWithSource(),
-                   CompletionCallback());
+  state.Initialize(&request_info, false, LOW, NetLogWithSource());
   EXPECT_EQ("PUT http://www.example.com/path?foo=bar HTTP/1.1\r\n",
             state.GenerateRequestLine());
 }

net/http/http_basic_stream.cc

@@ -29,7 +29,7 @@ int HttpBasicStream::InitializeStream(const HttpRequestInfo* request_info,
                                       RequestPriority priority,
                                       const NetLogWithSource& net_log,
                                       const CompletionCallback& callback) {
-  state_.Initialize(request_info, can_send_early, priority, net_log, callback);
+  state_.Initialize(request_info, can_send_early, priority, net_log);
   return OK;
 }
 

net/websockets/websocket_basic_handshake_stream.cc

@@ -318,7 +318,7 @@ int WebSocketBasicHandshakeStream::InitializeStream(
     const NetLogWithSource& net_log,
     const CompletionCallback& callback) {
   url_ = request_info->url;
-  state_.Initialize(request_info, can_send_early, priority, net_log, callback);
+  state_.Initialize(request_info, can_send_early, priority, net_log);
   return OK;
 }