Flip: FlipSessionPool changes.

net/flip/flip_session.cc

 // Copyright (c) 2009 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/flip/flip_session.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/rand_util.h"
 #include "base/stats_counters.h"
 #include "base/string_util.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_util.h"
 #include "net/flip/flip_frame_builder.h"
 #include "net/flip/flip_protocol.h"
 #include "net/flip/flip_stream.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_request_info.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_response_info.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/tools/dump_cache/url_to_filename_encoder.h"
 
 namespace net {
 
 // static
-scoped_ptr<FlipSessionPool> FlipSession::session_pool_;
 bool FlipSession::use_ssl_ = true;
 int PrioritizedIOBuffer::order_ = 0;
 
-FlipSession* FlipSession::GetFlipSession(
-    const HostResolver::RequestInfo& info,
-    HttpNetworkSession* session) {
-  if (!session_pool_.get())
-    session_pool_.reset(new FlipSessionPool());
-  return session_pool_->Get(info, session);
-}
-
 FlipSession::FlipSession(std::string host, HttpNetworkSession* session)
     : ALLOW_THIS_IN_INITIALIZER_LIST(
           connect_callback_(this, &FlipSession::OnTCPConnect)),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           ssl_connect_callback_(this, &FlipSession::OnSSLConnect)),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           read_callback_(this, &FlipSession::OnReadComplete)),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           write_callback_(this, &FlipSession::OnWriteComplete)),
       domain_(host),
@@ skipping 13 matching lines @@
 }
 
 FlipSession::~FlipSession() {
   // Cleanup all the streams.
   CloseAllStreams(net::ERR_ABORTED);
 
   if (connection_.is_initialized()) {
     // With Flip we can't recycle sockets.
     connection_.socket()->Disconnect();
   }
-  if (session_pool_.get())
-    session_pool_->Remove(this);
+
+  session_->flip_session_pool()->Remove(this);
 }
 
 net::Error FlipSession::Connect(const std::string& group_name,
                                 const HostResolver::RequestInfo& host,
                                 int priority) {
   DCHECK(priority >= 0 && priority < 4);
 
   // If the connect process is started, let the caller continue.
   if (connection_started_)
     return net::OK;
@@ skipping 176 matching lines @@
 
   // TODO(mbelshe): Write a method for tearing down a stream
   //                that cleans it out of the active list, the pending list,
   //                etc.
   FlipStream* stream = active_streams_[id];
   DeactivateStream(id);
   delete stream;
   return true;
 }
 
-bool FlipSession::IsStreamActive(int id) {
+bool FlipSession::IsStreamActive(int id) const {
   return active_streams_.find(id) != active_streams_.end();
 }
 
 LoadState FlipSession::GetLoadState() const {
   // TODO(mbelshe): needs more work
   return LOAD_STATE_CONNECTING;
 }
 
 void FlipSession::OnTCPConnect(int result) {
   LOG(INFO) << "Flip socket connected (result=" << result << ")";
@@ skipping 445 matching lines @@
     DeactivateStream(stream_id);
     delete stream;
   }
 }
 
 void FlipSession::OnLameDuck() {
   NOTIMPLEMENTED();
 }
 
 }  // namespace net