Revert of Net: Stop treating partial HTTP headers as a valid response.

net/http/http_stream_parser_unittest.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_stream_parser.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 587 matching lines @@
     truncated_in_header_reads,
     truncated_after_header_reads,
     truncated_after_final_newline_reads,
     not_truncated_reads,
   };
 
   MockWrite writes[] = {
     MockWrite(SYNCHRONOUS, 0, "GET / HTTP/1.1\r\n\r\n"),
   };
 
-  for (size_t i = 0; i < arraysize(reads); i++) {
-    SCOPED_TRACE(i);
-    SequencedSocketData data(reads[i], 2, writes, arraysize(writes));
-    scoped_ptr<ClientSocketHandle> socket_handle(
-        CreateConnectedSocketHandle(&data));
+  enum {
+    HTTP = 0,
+    HTTPS,
+    NUM_PROTOCOLS,
+  };
 
-    HttpRequestInfo request_info;
-    request_info.url = GURL("http://localhost");
+  for (size_t protocol = 0; protocol < NUM_PROTOCOLS; protocol++) {
+    SCOPED_TRACE(protocol);
 
-    scoped_refptr<GrowableIOBuffer> read_buffer(new GrowableIOBuffer);
-    HttpStreamParser parser(socket_handle.get(), &request_info,
-                            read_buffer.get(), BoundNetLog());
+    for (size_t i = 0; i < arraysize(reads); i++) {
+      SCOPED_TRACE(i);
+      SequencedSocketData data(reads[i], 2, writes, arraysize(writes));
+      scoped_ptr<ClientSocketHandle> socket_handle(
+          CreateConnectedSocketHandle(&data));
 
-    HttpRequestHeaders request_headers;
-    HttpResponseInfo response_info;
-    TestCompletionCallback callback;
-    ASSERT_EQ(OK, parser.SendRequest("GET / HTTP/1.1\r\n", request_headers,
-                                     &response_info, callback.callback()));
+      HttpRequestInfo request_info;
+      request_info.method = "GET";
+      if (protocol == HTTP) {
+        request_info.url = GURL("http://localhost");
+      } else {
+        request_info.url = GURL("https://localhost");
+      }
+      request_info.load_flags = LOAD_NORMAL;
 
-    int rv = parser.ReadResponseHeaders(callback.callback());
-    if (i == arraysize(reads) - 1) {
-      EXPECT_EQ(OK, rv);
-      EXPECT_TRUE(response_info.headers.get());
-    } else {
-      EXPECT_EQ(ERR_RESPONSE_HEADERS_TRUNCATED, rv);
-      EXPECT_FALSE(response_info.headers.get());
+      scoped_refptr<GrowableIOBuffer> read_buffer(new GrowableIOBuffer);
+      HttpStreamParser parser(
+          socket_handle.get(), &request_info, read_buffer.get(), BoundNetLog());
+
+      HttpRequestHeaders request_headers;
+      HttpResponseInfo response_info;
+      TestCompletionCallback callback;
+      ASSERT_EQ(OK, parser.SendRequest("GET / HTTP/1.1\r\n", request_headers,
+                                       &response_info, callback.callback()));
+
+      int rv = parser.ReadResponseHeaders(callback.callback());
+      if (i == arraysize(reads) - 1) {
+        EXPECT_EQ(OK, rv);
+        EXPECT_TRUE(response_info.headers.get());
+      } else {
+        if (protocol == HTTP) {
+          EXPECT_EQ(ERR_CONNECTION_CLOSED, rv);
+          EXPECT_TRUE(response_info.headers.get());
+        } else {
+          EXPECT_EQ(ERR_RESPONSE_HEADERS_TRUNCATED, rv);
+          EXPECT_FALSE(response_info.headers.get());
+        }
+      }
     }
   }
 }
 
 // Confirm that on 101 response, the headers are parsed but the data that
 // follows remains in the buffer.
 TEST(HttpStreamParser, Websocket101Response) {
   MockRead reads[] = {
     MockRead(SYNCHRONOUS, 1,
              "HTTP/1.1 101 Switching Protocols\r\n"
@@ skipping 384 matching lines @@
   response_info.reset();
 
   scoped_refptr<IOBuffer> body_buffer(new IOBuffer(kBodySize));
   ASSERT_EQ(kBodySize, parser.ReadResponseBody(
       body_buffer.get(), kBodySize, callback.callback()));
 }
 
 }  // namespace
 
 }  // namespace net