Revert of Temporary: Detect WebSocket destruction order problem

net/http/http_network_session.h

 // 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.
 
 #ifndef NET_HTTP_HTTP_NETWORK_SESSION_H_
 #define NET_HTTP_HTTP_NETWORK_SESSION_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 264 matching lines @@
 
   // Populates |*npn_protos| with protocols to be used with NPN.
   void GetNpnProtos(NextProtoVector* npn_protos) const;
 
   // Populates |server_config| and |proxy_config| based on this session and
   // |request|.
   void GetSSLConfig(const HttpRequestInfo& request,
                     SSLConfig* server_config,
                     SSLConfig* proxy_config) const;
 
-  // TODO(ricea): Remove this by October 2016.
-  void IncrementActiveWebSockets() { ++active_websockets_; }
-  void DecrementActiveWebSockets() { --active_websockets_; }
-
  private:
   friend class HttpNetworkSessionPeer;
 
   ClientSocketPoolManager* GetSocketPoolManager(SocketPoolType pool_type);
 
   // Flush sockets on low memory notifications callback.
   void OnMemoryPressure(
       base::MemoryPressureListener::MemoryPressureLevel memory_pressure_level);
 
   NetLog* const net_log_;
@@ skipping 14 matching lines @@
   std::unique_ptr<HttpStreamFactory> http_stream_factory_;
   std::unique_ptr<HttpStreamFactory> http_stream_factory_for_websocket_;
   std::set<HttpResponseBodyDrainer*> response_drainers_;
 
   NextProtoVector next_protos_;
   bool enabled_protocols_[NUM_VALID_ALTERNATE_PROTOCOLS];
 
   Params params_;
 
   std::unique_ptr<base::MemoryPressureListener> memory_pressure_listener_;
-
-  // TODO(ricea): Remove this by October 2016.
-  int active_websockets_ = 0;
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_NETWORK_SESSION_H_