Update from chromium https://crrev.com/302282

net/websockets/websocket_basic_handshake_stream.cc

 // Copyright 2013 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/websockets/websocket_basic_handshake_stream.h"
 
 #include <algorithm>
 #include <iterator>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/base64.h"
 #include "base/basictypes.h"
 #include "base/bind.h"
+#include "base/compiler_specific.h"
 #include "base/containers/hash_tables.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
@@ skipping 13 matching lines @@
 #include "net/websockets/websocket_deflater.h"
 #include "net/websockets/websocket_extension_parser.h"
 #include "net/websockets/websocket_handshake_constants.h"
 #include "net/websockets/websocket_handshake_handler.h"
 #include "net/websockets/websocket_handshake_request_info.h"
 #include "net/websockets/websocket_handshake_response_info.h"
 #include "net/websockets/websocket_stream.h"
 
 namespace net {
 
+namespace {
+
+// TODO(yhirano): Remove these functions once http://crbug.com/399535 is fixed.
+NOINLINE void RunCallbackWithOk(const CompletionCallback& callback,
+                                int result) {
+  DCHECK_EQ(result, OK);
+  callback.Run(OK);
+}
+
+NOINLINE void RunCallbackWithInvalidResponseCausedByRedirect(
+    const CompletionCallback& callback,
+    int result) {
+  DCHECK_EQ(result, ERR_INVALID_RESPONSE);
+  callback.Run(ERR_INVALID_RESPONSE);
+}
+
+NOINLINE void RunCallbackWithInvalidResponse(
+    const CompletionCallback& callback,
+    int result) {
+  DCHECK_EQ(result, ERR_INVALID_RESPONSE);
+  callback.Run(ERR_INVALID_RESPONSE);
+}
+
+NOINLINE void RunCallback(const CompletionCallback& callback, int result) {
+  callback.Run(result);
+}
+
+}  // namespace
+
 // TODO(ricea): If more extensions are added, replace this with a more general
 // mechanism.
 struct WebSocketExtensionParams {
   WebSocketExtensionParams()
       : deflate_enabled(false),
         client_window_bits(15),
         deflate_mode(WebSocketDeflater::TAKE_OVER_CONTEXT) {}
 
   bool deflate_enabled;
   int client_window_bits;
@@ skipping 364 matching lines @@
   // HttpStreamParser uses a weak pointer when reading from the
   // socket, so it won't be called back after being destroyed. The
   // HttpStreamParser is owned by HttpBasicState which is owned by this object,
   // so this use of base::Unretained() is safe.
   int rv = parser()->ReadResponseHeaders(
       base::Bind(&WebSocketBasicHandshakeStream::ReadResponseHeadersCallback,
                  base::Unretained(this),
                  callback));
   if (rv == ERR_IO_PENDING)
     return rv;
-  return ValidateResponse(rv);
+  bool is_redirect = false;
+  return ValidateResponse(rv, &is_redirect);
 }
 
 int WebSocketBasicHandshakeStream::ReadResponseBody(
     IOBuffer* buf,
     int buf_len,
     const CompletionCallback& callback) {
   return parser()->ReadResponseBody(buf, buf_len, callback);
 }
 
 void WebSocketBasicHandshakeStream::Close(bool not_reusable) {
@@ skipping 84 matching lines @@
 }
 
 void WebSocketBasicHandshakeStream::SetWebSocketKeyForTesting(
     const std::string& key) {
   handshake_challenge_for_testing_.reset(new std::string(key));
 }
 
 void WebSocketBasicHandshakeStream::ReadResponseHeadersCallback(
     const CompletionCallback& callback,
     int result) {
-  callback.Run(ValidateResponse(result));
+  bool is_redirect = false;
+  int rv = ValidateResponse(result, &is_redirect);
+
+  // TODO(yhirano): Simplify this statement once http://crbug.com/399535 is
+  // fixed.
+  switch (rv) {
+    case OK:
+      RunCallbackWithOk(callback, rv);
+      break;
+    case ERR_INVALID_RESPONSE:
+      if (is_redirect)
+        RunCallbackWithInvalidResponseCausedByRedirect(callback, rv);
+      else
+        RunCallbackWithInvalidResponse(callback, rv);
+      break;
+    default:
+      RunCallback(callback, rv);
+      break;
+  }
 }
 
 void WebSocketBasicHandshakeStream::OnFinishOpeningHandshake() {
   DCHECK(http_response_info_);
   WebSocketDispatchOnFinishOpeningHandshake(connect_delegate_,
                                             url_,
                                             http_response_info_->headers,
                                             http_response_info_->response_time);
 }
 
-int WebSocketBasicHandshakeStream::ValidateResponse(int rv) {
+int WebSocketBasicHandshakeStream::ValidateResponse(int rv,
+                                                    bool* is_redirect) {
   DCHECK(http_response_info_);
+  *is_redirect = false;
   // Most net errors happen during connection, so they are not seen by this
   // method. The histogram for error codes is created in
   // Delegate::OnResponseStarted in websocket_stream.cc instead.
   if (rv >= 0) {
     const HttpResponseHeaders* headers = http_response_info_->headers.get();
     const int response_code = headers->response_code();
+    *is_redirect = HttpResponseHeaders::IsRedirectResponseCode(response_code);
     UMA_HISTOGRAM_SPARSE_SLOWLY("Net.WebSocket.ResponseCode", response_code);
     switch (response_code) {
       case HTTP_SWITCHING_PROTOCOLS:
         OnFinishOpeningHandshake();
         return ValidateUpgradeResponse(headers);
 
       // We need to pass these through for authentication to work.
       case HTTP_UNAUTHORIZED:
       case HTTP_PROXY_AUTHENTICATION_REQUIRED:
         return OK;
@@ skipping 51 matching lines @@
   set_failure_message("Error during WebSocket handshake: " + failure_message);
   return ERR_INVALID_RESPONSE;
 }
 
 void WebSocketBasicHandshakeStream::set_failure_message(
     const std::string& failure_message) {
   *failure_message_ = failure_message;
 }
 
 }  // namespace net