[SPDY] Use WeakPtr<SpdySession> everywhere but SpdySessionPool

net/spdy/spdy_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_SPDY_SPDY_SESSION_H_
 #define NET_SPDY_SPDY_SESSION_H_
 
 #include <deque>
 #include <map>
 #include <set>
@@ skipping 115 matching lines @@
   // which point ReleaseStream() may be called. Otherwise, the stream
   // is not created, an error is returned, and ReleaseStream() may not
   // be called.
   //
   // If OK is returned, must not be called again without
   // ReleaseStream() being called first. If ERR_IO_PENDING is
   // returned, must not be called again without CancelRequest() or
   // ReleaseStream() being called first. Otherwise, in case of an
   // immediate error, this may be called again.
   int StartRequest(SpdyStreamType type,
-                   const scoped_refptr<SpdySession>& session,
+                   const base::WeakPtr<SpdySession>& session,
                    const GURL& url,
                    RequestPriority priority,
                    const BoundNetLog& net_log,
                    const CompletionCallback& callback);
 
   // Cancels any pending stream creation request. May be called
   // repeatedly.
   void CancelRequest();
 
   // Transfers the created stream (guaranteed to not be NULL) to the
@@ skipping 16 matching lines @@
 
   // Accessors called by |session_|.
   SpdyStreamType type() const { return type_; }
   const GURL& url() const { return url_; }
   RequestPriority priority() const { return priority_; }
   const BoundNetLog& net_log() const { return net_log_; }
 
   void Reset();
 
   SpdyStreamType type_;
-  scoped_refptr<SpdySession> session_;
+  base::WeakPtr<SpdySession> session_;
   base::WeakPtr<SpdyStream> stream_;
   GURL url_;
   RequestPriority priority_;
   BoundNetLog net_log_;
   CompletionCallback callback_;
 
   DISALLOW_COPY_AND_ASSIGN(SpdyStreamRequest);
 };
 
 class NET_EXPORT SpdySession : public base::RefCounted<SpdySession>,
@@ skipping 153 matching lines @@
   // if server bound certs are not supported in this session.
   ServerBoundCertService* GetServerBoundCertService() const;
 
   // Send a WINDOW_UPDATE frame for a stream. Called by a stream
   // whenever receive window size is increased.
   void SendStreamWindowUpdate(SpdyStreamId stream_id,
                               uint32 delta_window_size);
 
   // Whether the stream is closed, i.e. it has stopped processing data
   // and is about to be destroyed.
+  //
+  // TODO(akalin): This is only used in tests. Remove this function
+  // and have tests test the WeakPtr instead.
   bool IsClosed() const { return availability_state_ == STATE_CLOSED; }
 
   // Closes this session. This will close all active streams and mark
   // the session as permanently closed. Callers must assume that the
   // session is destroyed after this is called. (However, it may not
   // be destroyed right away, e.g. when a SpdySession function is
   // present in the call stack.)
   //
   // |err| should be < ERR_IO_PENDING; this function is intended to be
   // called on error.
@@ skipping 99 matching lines @@
   }
 
   size_t GetFrameMaximumSize() const {
     return buffered_spdy_framer_->GetFrameMaximumSize();
   }
 
   size_t GetDataFrameMaximumPayload() const {
     return buffered_spdy_framer_->GetDataFrameMaximumPayload();
   }
 
+  // Must be used only by |pool_|.
+  base::WeakPtr<SpdySession> GetWeakPtr();
+
   // LayeredPool implementation:
   virtual bool CloseOneIdleConnection() OVERRIDE;
 
  private:
   friend class base::RefCounted<SpdySession>;
   friend class SpdyStreamRequest;
   friend class SpdySessionTest;
 
   // Allow tests to access our innards for testing purposes.
   FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, ClientPing);
@@ skipping 626 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_;
 
   TimeFunc time_func_;
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_SESSION_H_