[SPDY] Use WeakPtr<SpdySession> everywhere but SpdySessionPool

net/spdy/spdy_session_pool.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_SPDY_SPDY_SESSION_POOL_H_
 #define NET_SPDY_SPDY_SESSION_POOL_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 66 matching lines @@
   // was no error.
   //
   // If successful, OK is returned and |available_session| will be
   // non-NULL and available. Otherwise, an error is returned and
   // |available_session| will be NULL.
   net::Error CreateAvailableSessionFromSocket(
       const SpdySessionKey& key,
       scoped_ptr<ClientSocketHandle> connection,
       const BoundNetLog& net_log,
       int certificate_error_code,
-      scoped_refptr<SpdySession>* available_session,
+      base::WeakPtr<SpdySession>* available_session,
       bool is_secure);
 
   // Find an available session for the given key, or NULL if there isn't one.
-  scoped_refptr<SpdySession> FindAvailableSession(const SpdySessionKey& key,
+  base::WeakPtr<SpdySession> FindAvailableSession(const SpdySessionKey& key,
                                                   const BoundNetLog& net_log);
 
   // Remove all mappings and aliases for the given session, which must
   // still be available. Except for in tests, this must be called by
   // the given session itself.
   void MakeSessionUnavailable(
-      const scoped_refptr<SpdySession>& available_session);
+      const base::WeakPtr<SpdySession>& available_session);
 
   // Removes an unavailable session from the pool.  Except for in
   // tests, this must be called by the given session itself.
   void RemoveUnavailableSession(
-      const scoped_refptr<SpdySession>& unavailable_session);
+      const base::WeakPtr<SpdySession>& unavailable_session);
 
   // Close only the currently existing SpdySessions with |error|.
   // Let any new ones created while this method is running continue to
   // live.
   void CloseCurrentSessions(net::Error error);
 
   // Close only the currently existing SpdySessions that are idle.
   // Let any new ones created while this method is running continue to
   // live.
   void CloseCurrentIdleSessions();
@@ skipping 23 matching lines @@
   virtual void OnSSLConfigChanged() OVERRIDE;
 
   // CertDatabase::Observer methods:
   virtual void OnCertAdded(const X509Certificate* cert) OVERRIDE;
   virtual void OnCertTrustChanged(const X509Certificate* cert) OVERRIDE;
 
  private:
   friend class SpdySessionPoolPeer;  // For testing.
 
   typedef std::set<scoped_refptr<SpdySession> > SessionSet;
-  typedef std::map<SpdySessionKey, scoped_refptr<SpdySession> >
+  typedef std::map<SpdySessionKey, base::WeakPtr<SpdySession> >
       AvailableSessionMap;
   typedef std::map<IPEndPoint, SpdySessionKey> AliasMap;
 
   // Returns true iff |session| is in |available_sessions_|.
-  bool IsSessionAvailable(const scoped_refptr<SpdySession>& session) const;
+  bool IsSessionAvailable(const base::WeakPtr<SpdySession>& session) const;
 
   // Returns a normalized version of the given key suitable for lookup
   // into |available_sessions_|.
   const SpdySessionKey& NormalizeListKey(const SpdySessionKey& key) const;
 
   // Map the given key to the given session. There must not already be
   // a mapping for |key|.
   void MapKeyToAvailableSession(const SpdySessionKey& key,
-                                const scoped_refptr<SpdySession>& session);
+                                const base::WeakPtr<SpdySession>& session);
 
   // Returns an iterator into |available_sessions_| for the given key,
   // which may be equal to |available_sessions_.end()|.
   AvailableSessionMap::iterator LookupAvailableSessionByKey(
       const SpdySessionKey& key);
 
   // Remove the mapping of the given key, which must exist.
   void UnmapKey(const SpdySessionKey& key);
 
   // Remove all aliases for |key| from the aliases table.
@@ skipping 42 matching lines @@
   // This SPDY proxy is allowed to push resources from origins that are
   // different from those of their associated streams.
   HostPortPair trusted_spdy_proxy_;
 
   DISALLOW_COPY_AND_ASSIGN(SpdySessionPool);
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_SESSION_POOL_H_