Flip: FlipSessionPool changes.

net/flip/flip_session.h

 // 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.
 
 #ifndef NET_FLIP_FLIP_SESSION_H_
 #define NET_FLIP_FLIP_SESSION_H_
 
 #include <deque>
 #include <list>
 #include <map>
@@ skipping 102 matching lines @@
  private:
   scoped_refptr<IOBufferWithSize> buffer_;
   int priority_;
   int position_;
   static int order_;  // Maintains a FIFO order for equal priorities.
 };
 
 class FlipSession : public base::RefCounted<FlipSession>,
                     public flip::FlipFramerVisitorInterface {
  public:
-  // Factory for finding open sessions.
-  // TODO(mbelshe): Break this out into a connection pool class?
-  static FlipSession* GetFlipSession(const HostResolver::RequestInfo&,
-                                     HttpNetworkSession* session);
   virtual ~FlipSession();
 
   // Get the domain for this FlipSession.
-  std::string domain() { return domain_; }
+  const std::string& domain() const { return domain_; }
 
   // Connect the FLIP Socket.
   // Returns net::Error::OK on success.
   // Note that this call does not wait for the connect to complete. Callers can
   // immediately start using the FlipSession while it connects.
   net::Error Connect(const std::string& group_name,
                      const HostResolver::RequestInfo& host, int priority);
 
   // Create a new stream.
   // FlipDelegate must remain valid until the stream is either cancelled by the
   // creator via CancelStream or the FlipDelegate OnClose or OnCancel callbacks
   // have been made.
   // Once the stream is created, the delegate should wait for a callback.
   int CreateStream(FlipDelegate* delegate);
 
   // Cancel a stream.
   bool CancelStream(int id);
 
   // Check if a stream is active.
-  bool IsStreamActive(int id);
+  bool IsStreamActive(int id) const;
 
   // The LoadState is used for informing the user of the current network
   // status, such as "resolving host", "connecting", etc.
   LoadState GetLoadState() const;
+
  protected:
   friend class FlipNetworkTransactionTest;
   friend class FlipSessionPool;
   friend class HttpNetworkLayer;  // Temporary for server.
 
   // Provide access to the framer for testing.
   flip::FlipFramer* GetFramer() { return &flip_framer_; }
 
   // Create a new FlipSession.
   // |host| is the hostname that this session connects to.
@@ skipping 89 matching lines @@
 
   // TODO(mbelshe): this is ugly!!
   // The packet we are currently sending.
   PrioritizedIOBuffer in_flight_write_;
   bool delayed_write_pending_;
   bool write_pending_;
 
   // Flip Frame state.
   flip::FlipFramer flip_framer_;
 
-  // This is our weak session pool - one session per domain.
-  static scoped_ptr<FlipSessionPool> session_pool_;
   static bool use_ssl_;
 };
 
 }  // namespace net
 
 #endif  // NET_FLIP_FLIP_SESSION_H_
-