summaryrefslogtreecommitdiffstats
path: root/net/spdy/spdy_framer.h
diff options
context:
space:
mode:
authorjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-09 16:25:08 +0000
committerjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-09 16:25:08 +0000
commit7d6b896aeb696ba04b9acfdc88708785df15289a (patch)
tree88eca4a04e6ed0dd2797a7b6f0c47ed734b65cd7 /net/spdy/spdy_framer.h
parent0ac338051b72a1e3717bcf8a54270cfeb50f1d13 (diff)
downloadchromium_src-7d6b896aeb696ba04b9acfdc88708785df15289a.zip
chromium_src-7d6b896aeb696ba04b9acfdc88708785df15289a.tar.gz
chromium_src-7d6b896aeb696ba04b9acfdc88708785df15289a.tar.bz2
Revert 44092 - Add support for the SPDY session frame.
per request from Mbelshe... reverting to fix tree. BUG=34749 TEST=SpdyNetworkTransactionTest.SettingsSaved, SettingsPlayback Review URL: http://codereview.chromium.org/1595013 TBR=mbelshe@chromium.org Review URL: http://codereview.chromium.org/1621009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44093 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_framer.h')
-rw-r--r--net/spdy/spdy_framer.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/spdy/spdy_framer.h b/net/spdy/spdy_framer.h
index c265be9..ab454cd 100644
--- a/net/spdy/spdy_framer.h
+++ b/net/spdy/spdy_framer.h
@@ -43,8 +43,7 @@ void FramerSetEnableCompressionHelper(SpdyFramer* framer, bool compress);
typedef std::map<std::string, std::string> SpdyHeaderBlock;
// A datastructure for holding a set of ID/value pairs for a SETTINGS frame.
-typedef std::pair<spdy::SettingsFlagsAndId, uint32> SpdySetting;
-typedef std::list<SpdySetting> SpdySettings;
+typedef std::list<std::pair<spdy::SettingsFlagsAndId, uint32> > SpdySettings;
// SpdyFramerVisitorInterface is a set of callbacks for the SpdyFramer.
// Implement this interface to receive event callbacks as frames are