Refactor BufferedSpdyFramer so that SpdySession is not a visitor of

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_
 #pragma once
 
 #include <deque>
 #include <list>
@@ skipping 213 matching lines @@
   // session pool.
   void CloseSessionOnError(net::Error err, bool remove_from_pool);
 
   // Retrieves information on the current state of the SPDY session as a
   // Value.  Caller takes possession of the returned value.
   base::Value* GetInfoAsValue() const;
 
   // Indicates whether the session is being reused after having successfully
   // used to send/receive data in the past.
   bool IsReused() const {
-    return frames_received_ > 0;
+    return buffered_spdy_framer_.frames_received() > 0;
   }
 
   // Returns true if the underlying transport socket ever had any reads or
   // writes.
   bool WasEverUsed() const {
     return connection_->socket()->WasEverUsed();
   }
 
   void set_spdy_session_pool(SpdySessionPool* pool) {
     spdy_session_pool_ = NULL;
@@ skipping 81 matching lines @@
 
   virtual ~SpdySession();
 
   void ProcessPendingCreateStreams();
   int CreateStreamImpl(
       const GURL& url,
       RequestPriority priority,
       scoped_refptr<SpdyStream>* spdy_stream,
       const BoundNetLog& stream_net_log);
 
-  // Control frame handlers.
-  void OnRst(const spdy::SpdyRstStreamControlFrame& frame);
-  void OnGoAway(const spdy::SpdyGoAwayControlFrame& frame);
-  void OnPing(const spdy::SpdyPingControlFrame& frame);
-  void OnSettings(const spdy::SpdySettingsControlFrame& frame);
-  void OnWindowUpdate(const spdy::SpdyWindowUpdateControlFrame& frame);
-  void OnCredential(const spdy::SpdyCredentialControlFrame& frame);
-
   // IO Callbacks
   void OnReadComplete(int result);
   void OnWriteComplete(int result);
 
   // Send relevant SETTINGS.  This is generally called on connection setup.
   void SendSettings();
 
   // Handle SETTINGS.  Either when we send settings, or when we receive a
   // SETTINGS control frame, update our SpdySession accordingly.
   void HandleSettings(const spdy::SpdySettings& settings);
@@ skipping 66 matching lines @@
   void RecordHistograms();
 
   // Closes all streams.  Used as part of shutdown.
   void CloseAllStreams(net::Error status);
 
   // Invokes a user callback for stream creation.  We provide this method so it
   // can be deferred to the MessageLoop, so we avoid re-entrancy problems.
   void InvokeUserStreamCreationCallback(scoped_refptr<SpdyStream>* stream);
 
   // BufferedSpdyFramerVisitorInterface:
-  virtual void OnError(spdy::SpdyFramer*) OVERRIDE;
+  virtual void OnError() OVERRIDE;
+  virtual void OnStreamError(spdy::SpdyStreamId stream_id) OVERRIDE;
+  virtual void OnRstStream(
+      const spdy::SpdyRstStreamControlFrame& frame) OVERRIDE;
+  virtual void OnGoAway(const spdy::SpdyGoAwayControlFrame& frame) OVERRIDE;
+  virtual void OnPing(const spdy::SpdyPingControlFrame& frame) OVERRIDE;
+  virtual void OnSettings(const spdy::SpdySettingsControlFrame& frame) OVERRIDE;
+  virtual void OnWindowUpdate(
+      const spdy::SpdyWindowUpdateControlFrame& frame) OVERRIDE;
   virtual void OnStreamFrameData(spdy::SpdyStreamId stream_id,
                                  const char* data,
                                  size_t len) OVERRIDE;
-  virtual void OnControl(const spdy::SpdyControlFrame* frame) OVERRIDE;
-
-  virtual bool OnControlFrameHeaderData(spdy::SpdyStreamId stream_id,
-                                        const char* header_data,
-                                        size_t len) OVERRIDE;
-
-  virtual bool OnCredentialFrameData(const char* frame_data,
-                                     size_t len) OVERRIDE;
-
-  virtual void OnDataFrameHeader(const spdy::SpdyDataFrame* frame) OVERRIDE;
-
-  virtual void OnSyn(const spdy::SpdySynStreamControlFrame& frame,
-                     const linked_ptr<spdy::SpdyHeaderBlock>& headers) OVERRIDE;
+  virtual void OnSynStream(
+      const spdy::SpdySynStreamControlFrame& frame,
+      const linked_ptr<spdy::SpdyHeaderBlock>& headers) OVERRIDE;
   virtual void OnSynReply(
       const spdy::SpdySynReplyControlFrame& frame,
       const linked_ptr<spdy::SpdyHeaderBlock>& headers) OVERRIDE;
   virtual void OnHeaders(
       const spdy::SpdyHeadersControlFrame& frame,
       const linked_ptr<spdy::SpdyHeaderBlock>& headers) OVERRIDE;
 
   // --------------------------
   // Helper methods for testing
   // --------------------------
@@ skipping 99 matching lines @@
   State state_;
 
   // Limits
   size_t max_concurrent_streams_;  // 0 if no limit
 
   // Some statistics counters for the session.
   int streams_initiated_count_;
   int streams_pushed_count_;
   int streams_pushed_and_claimed_count_;
   int streams_abandoned_count_;
-  int frames_received_;
   int bytes_received_;
   bool sent_settings_;      // Did this session send settings when it started.
   bool received_settings_;  // Did this session receive at least one settings
                             // frame.
   int stalled_streams_;     // Count of streams that were ever stalled.
 
   // Count of all pings on the wire, for which we have not gotten a response.
   int64 pings_in_flight_;
 
   // This is the next ping_id (unique_id) to be sent in PING frame.
@@ skipping 111 matching lines @@
 
   const size_t slot_;
   const std::string origin_;
 
   DISALLOW_COPY_AND_ASSIGN(NetLogSpdyCredentialParameter);
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_SESSION_H_