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

net/websockets/websocket_channel.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_channel.h"
 
 #include <limits.h>  // for INT_MAX
 
 #include <algorithm>
 #include <deque>
@@ skipping 279 matching lines @@
 WebSocketChannel::WebSocketChannel(
     scoped_ptr<WebSocketEventInterface> event_interface,
     URLRequestContext* url_request_context)
     : event_interface_(event_interface.Pass()),
       url_request_context_(url_request_context),
       send_quota_low_water_mark_(kDefaultSendQuotaLowWaterMark),
       send_quota_high_water_mark_(kDefaultSendQuotaHighWaterMark),
       current_send_quota_(0),
       current_receive_quota_(0),
       timeout_(base::TimeDelta::FromSeconds(kClosingHandshakeTimeoutSeconds)),
+      has_received_close_frame_(false),
       received_close_code_(0),
       state_(FRESHLY_CONSTRUCTED),
       notification_sender_(new HandshakeNotificationSender(this)),
       sending_text_message_(false),
       receiving_text_message_(false),
       expecting_to_handle_continuation_(false),
       initial_frame_forwarded_(false) {}
 
 WebSocketChannel::~WebSocketChannel() {
   // The stream may hold a pointer to read_frames_, and so it needs to be
@@ skipping 427 matching lines @@
     default:
       DCHECK_LT(result, 0)
           << "ReadFrames() should only return OK or ERR_ codes";
 
       stream_->Close();
       SetState(CLOSED);
 
       uint16 code = kWebSocketErrorAbnormalClosure;
       std::string reason = "";
       bool was_clean = false;
-      if (received_close_code_ != 0) {
+      if (has_received_close_frame_) {
         code = received_close_code_;
         reason = received_close_reason_;
         was_clean = (result == ERR_CONNECTION_CLOSED);
       }
 
       return DoDropChannel(was_clean, code, reason);
   }
 }
 
 ChannelState WebSocketChannel::HandleFrame(scoped_ptr<WebSocketFrame> frame) {
@@ skipping 79 matching lines @@
       switch (state_) {
         case CONNECTED:
           SetState(RECV_CLOSED);
           if (SendClose(code, reason) == CHANNEL_DELETED)
             return CHANNEL_DELETED;
           DCHECK_EQ(RECV_CLOSED, state_);
           SetState(CLOSE_WAIT);
 
           if (event_interface_->OnClosingHandshake() == CHANNEL_DELETED)
             return CHANNEL_DELETED;
+          has_received_close_frame_  = true;
           received_close_code_ = code;
           received_close_reason_ = reason;
           break;
 
         case SEND_CLOSED:
           SetState(CLOSE_WAIT);
           // From RFC6455 section 7.1.5: "Each endpoint
           // will see the status code sent by the other end as _The WebSocket
           // Connection Close Code_."
+          has_received_close_frame_  = true;
           received_close_code_ = code;
           received_close_reason_ = reason;
           break;
 
         default:
           LOG(DFATAL) << "Got Close in unexpected state " << state_;
           break;
       }
       return CHANNEL_ALIVE;
     }
@@ skipping 234 matching lines @@
 }
 
 void WebSocketChannel::CloseTimeout() {
   stream_->Close();
   SetState(CLOSED);
   DoDropChannel(false, kWebSocketErrorAbnormalClosure, "");
   // |this| has been deleted.
 }
 
 }  // namespace net