Revert of Temporary: Detect WebSocket destruction order problem

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 <stddef.h>
 
 #include <algorithm>
 #include <deque>
 #include <utility>
 #include <vector>
 
 #include "base/big_endian.h"
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "net/base/io_buffer.h"
-#include "net/http/http_network_session.h"  // TODO(ricea): Remove
 #include "net/http/http_request_headers.h"
 #include "net/http/http_response_headers.h"
-#include "net/http/http_transaction_factory.h"  // TODO(ricea): Remove
 #include "net/http/http_util.h"
 #include "net/log/net_log.h"
-#include "net/url_request/url_request_context.h"  // TODO(ricea): Remove
 #include "net/websockets/websocket_errors.h"
 #include "net/websockets/websocket_event_interface.h"
 #include "net/websockets/websocket_frame.h"
 #include "net/websockets/websocket_handshake_request_info.h"
 #include "net/websockets/websocket_handshake_response_info.h"
 #include "net/websockets/websocket_handshake_stream_create_helper.h"
 #include "net/websockets/websocket_mux.h"
 #include "net/websockets/websocket_stream.h"
 #include "url/origin.h"
 
@@ skipping 278 matching lines @@
       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() {
-  // TODO(ricea): Remove this by October 2016. See bug 641013.
-  if (stream_) {
-    HttpTransactionFactory* http_transaction_factory =
-        url_request_context_->http_transaction_factory();
-    if (http_transaction_factory)
-      http_transaction_factory->GetSession()->DecrementActiveWebSockets();
-  }
-
   // The stream may hold a pointer to read_frames_, and so it needs to be
   // destroyed first.
   stream_.reset();
   // The timer may have a callback pointing back to us, so stop it just in case
   // someone decides to run the event loop from their destructor.
   close_timer_.Stop();
 }
 
 void WebSocketChannel::SendAddChannelRequest(
     const GURL& socket_url,
@@ skipping 251 matching lines @@
   SetState(CONNECTING);
 }
 
 void WebSocketChannel::OnConnectSuccess(
     std::unique_ptr<WebSocketStream> stream) {
   DCHECK(stream);
   DCHECK_EQ(CONNECTING, state_);
 
   stream_ = std::move(stream);
 
-  // TODO(ricea): Remove this before October 2016.
-  HttpTransactionFactory* http_transaction_factory =
-      url_request_context_->http_transaction_factory();
-  if (http_transaction_factory)
-    http_transaction_factory->GetSession()->IncrementActiveWebSockets();
-
   SetState(CONNECTED);
 
   if (event_interface_->OnAddChannelResponse(stream_->GetSubProtocol(),
                                              stream_->GetExtensions()) ==
       CHANNEL_DELETED)
     return;
 
   // TODO(ricea): Get flow control information from the WebSocketStream once we
   // have a multiplexing WebSocketStream.
   current_send_quota_ = send_quota_high_water_mark_;
@@ skipping 570 matching lines @@
 }
 
 void WebSocketChannel::CloseTimeout() {
   stream_->Close();
   SetState(CLOSED);
   DoDropChannel(false, kWebSocketErrorAbnormalClosure, "");
   // |this| has been deleted.
 }
 
 }  // namespace net