diff options
| author | jgraettinger@chromium.org <jgraettinger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-12 19:03:55 +0000 |
|---|---|---|
| committer | jgraettinger@chromium.org <jgraettinger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-12 19:03:55 +0000 |
| commit | bd254d51c03c91f8a42113766d071834be3f8d08 (patch) | |
| tree | 52c06f54be693a7276bf96db85e30da9ea7993d7 /net/tools/flip_server | |
| parent | ccb820241f34c1a1f7a8eefcb7b20cd87b877c8d (diff) | |
| download | chromium_src-bd254d51c03c91f8a42113766d071834be3f8d08.zip chromium_src-bd254d51c03c91f8a42113766d071834be3f8d08.tar.gz chromium_src-bd254d51c03c91f8a42113766d071834be3f8d08.tar.bz2 | |
Changes the type for PING id from uint32 to uint64.
Required for HTTP2.
This lands server change 60786018 by birenroy.
Minor type updates to QUIC/SpdySession & friends were also required.
Review URL: https://codereview.chromium.org/154353003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250767 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools/flip_server')
| -rw-r--r-- | net/tools/flip_server/spdy_interface.h | 2 | ||||
| -rw-r--r-- | net/tools/flip_server/spdy_interface_test.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/tools/flip_server/spdy_interface.h b/net/tools/flip_server/spdy_interface.h index 5528395..19626e8 100644 --- a/net/tools/flip_server/spdy_interface.h +++ b/net/tools/flip_server/spdy_interface.h @@ -107,7 +107,7 @@ class SpdySM : public BufferedSpdyFramerVisitorInterface, public SMInterface { uint32 value) OVERRIDE {} // Called when a PING frame has been parsed. - virtual void OnPing(uint32 unique_id) OVERRIDE {} + virtual void OnPing(SpdyPingId unique_id) OVERRIDE {} // Called when a RST_STREAM frame has been parsed. virtual void OnRstStream(SpdyStreamId stream_id, diff --git a/net/tools/flip_server/spdy_interface_test.cc b/net/tools/flip_server/spdy_interface_test.cc index 389f06b..98eb3bf 100644 --- a/net/tools/flip_server/spdy_interface_test.cc +++ b/net/tools/flip_server/spdy_interface_test.cc @@ -60,7 +60,7 @@ class SpdyFramerVisitor : public BufferedSpdyFramerVisitorInterface { bool)); MOCK_METHOD1(OnSettings, void(bool clear_persisted)); MOCK_METHOD3(OnSetting, void(SpdySettingsIds, uint8, uint32)); - MOCK_METHOD1(OnPing, void(uint32 unique_id)); + MOCK_METHOD1(OnPing, void(SpdyPingId unique_id)); MOCK_METHOD2(OnRstStream, void(SpdyStreamId, SpdyRstStreamStatus)); MOCK_METHOD2(OnGoAway, void(SpdyStreamId, SpdyGoAwayStatus)); MOCK_METHOD2(OnWindowUpdate, void(SpdyStreamId, uint32)); |