SPDY - integration of spdy/3 code.

net/spdy/spdy_session.h

Index: net/spdy/spdy_session.h
===================================================================
--- net/spdy/spdy_session.h	(revision 125802)
+++ net/spdy/spdy_session.h	(working copy)
@@ -174,6 +174,9 @@
   // CLIENT_CERT_INVALID_TYPE if none was sent.
   SSLClientCertType GetOriginBoundCertType() const;
 
+  // Reset all static settings to initialized values. Used to init test suite.
+  static void ResetStaticSettingsToInit();
+
   // Enable or disable SSL.
   static void SetSSLMode(bool enable) { use_ssl_ = enable; }
   static bool SSLMode() { return use_ssl_; }
@@ -184,6 +187,13 @@
     use_flow_control_ = flow_control;
   }
 
+  // Specify which protocol to use. Used by unit tests. This only applies for

[Ryan Hamilton, 2012/03/09 19:09:58]

// Specify the SPDY protocol to be used for SPDY session which do not use NPN to
negotiate a particular protocol.  This is only called from unit tests.

[ramant (doing other things), 2012/03/10 01:14:09]

thanks much.
Done.

+  // new SpdySessions.
+  static void set_default_protocol(
+      SSLClientSocket::NextProto default_protocol) {
+    default_protocol_ = default_protocol;
+  }
+
   // Sets the max concurrent streams per session, as a ceiling on any server
   // specific SETTINGS value.
   static void set_max_concurrent_streams(size_t value) {
@@ -354,6 +364,7 @@
   // 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);
+  void HandleSetting(uint32 id, uint32 value);
 
   // Adjust the send window size of all ActiveStreams and PendingCreateStreams.
   void UpdateStreamsSendWindowSize(int32 delta_window_size);
@@ -437,12 +448,13 @@
       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 OnSetting(
+      spdy::SpdySettingsIds id, uint8 flags, uint32 value) OVERRIDE;
   virtual void OnSynStream(
       const spdy::SpdySynStreamControlFrame& frame,
       const linked_ptr<spdy::SpdyHeaderBlock>& headers) OVERRIDE;
@@ -623,6 +635,7 @@
 
   static bool use_ssl_;
   static FlowControl use_flow_control_;
+  static SSLClientSocket::NextProto default_protocol_;
   static size_t init_max_concurrent_streams_;
   static size_t max_concurrent_stream_limit_;