Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / net / spdy / spdy_session.h

diff --git a/src/net/spdy/spdy_session.h b/src/net/spdy/spdy_session.h
index 1873286..73f8cd4 100644 (file)
--- a/src/net/spdy/spdy_session.h
+++ b/src/net/spdy/spdy_session.h
@@ -290,7 +290,6 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
   scoped_ptr<SpdyFrame> CreateSynStream(
       SpdyStreamId stream_id,
       RequestPriority priority,
-      uint8 credential_slot,
       SpdyControlFlags flags,
       const SpdyHeaderBlock& headers);
 
@@ -357,6 +356,11 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
   // |description| indicates the reason for the error.
   void CloseSessionOnError(Error err, const std::string& description);
 
+  // Mark this session as unavailable, meaning that it will not be used to
+  // service new streams. Unlike when a GOAWAY frame is received, this function
+  // will not close any streams.
+  void MakeUnavailable();
+
   // Retrieves information on the current state of the SPDY session as a
   // Value.  Caller takes possession of the returned value.
   base::Value* GetInfoAsValue() const;
@@ -780,7 +784,7 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
   virtual void OnError(SpdyFramer::SpdyError error_code) OVERRIDE;
   virtual void OnStreamError(SpdyStreamId stream_id,
                              const std::string& description) OVERRIDE;
-  virtual void OnPing(uint32 unique_id) OVERRIDE;
+  virtual void OnPing(SpdyPingId unique_id) OVERRIDE;
   virtual void OnRstStream(SpdyStreamId stream_id,
                            SpdyRstStreamStatus status) OVERRIDE;
   virtual void OnGoAway(SpdyStreamId last_accepted_stream_id,
@@ -802,7 +806,6 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
   virtual void OnSynStream(SpdyStreamId stream_id,
                            SpdyStreamId associated_stream_id,
                            SpdyPriority priority,
-                           uint8 credential_slot,
                            bool fin,
                            bool unidirectional,
                            const SpdyHeaderBlock& headers) OVERRIDE;