diff options
author | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-03 22:04:03 +0000 |
---|---|---|
committer | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-03 22:04:03 +0000 |
commit | d083585002893abaa6172c361aa04306a0e4d396 (patch) | |
tree | 75ff77ddf51d68d450ee0e7d56192409e44bcf97 /net/socket | |
parent | 95c97199c4406036b216d74e4ba3a5c57c0081a2 (diff) | |
download | chromium_src-d083585002893abaa6172c361aa04306a0e4d396.zip chromium_src-d083585002893abaa6172c361aa04306a0e4d396.tar.gz chromium_src-d083585002893abaa6172c361aa04306a0e4d396.tar.bz2 |
Update server push to allow use of HEADERS frame.
- Sync'd server changes for SPDY protocol and framer.
- Adds HEADERS support & smaller header frame support.
- Changes field name from "path" to "url" for pushed streams.
- Changes existing semantics in SpdyStream and SpdyHttpStream
with how the OnResponseReceived callback works and with how
headers are parsed to reflect multi-frame arrival of headers.
Other changes:
- Reworked the StaticSocketDataProvider interface slightly so that we
can share code between tests using DelayedSocketData or
DeterministicSocketData
- Tidy up net_log for pushed streams with associated-stream id logging
and format fixes for SPDY_STREAM.
BUG=none
TEST=spdy_framer_test,spdy_network_transaction_unittest(s)
Review URL: http://codereview.chromium.org/5248001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68221 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
-rw-r--r-- | net/socket/socket_test_util.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h index 147a4ba..0a01df3 100644 --- a/net/socket/socket_test_util.h +++ b/net/socket/socket_test_util.h @@ -172,6 +172,7 @@ class StaticSocketDataProvider : public SocketDataProvider { virtual MockRead GetNextRead(); virtual MockWriteResult OnWrite(const std::string& data); virtual void Reset(); + virtual void CompleteRead() {} // These functions get access to the next available read and write data. const MockRead& PeekRead() const; @@ -284,7 +285,7 @@ class DelayedSocketData : public StaticSocketDataProvider, virtual MockRead GetNextRead(); virtual MockWriteResult OnWrite(const std::string& data); virtual void Reset(); - void CompleteRead(); + virtual void CompleteRead(); void ForceNextRead(); private: @@ -327,6 +328,8 @@ class OrderedSocketData : public StaticSocketDataProvider, virtual MockRead GetNextRead(); virtual MockWriteResult OnWrite(const std::string& data); virtual void Reset(); + virtual void CompleteRead(); + void SetCompletionCallback(CompletionCallback* callback) { callback_ = callback; } @@ -334,8 +337,6 @@ class OrderedSocketData : public StaticSocketDataProvider, // Posts a quit message to the current message loop, if one is running. void EndLoop(); - void CompleteRead(); - private: friend class base::RefCounted<OrderedSocketData>; virtual ~OrderedSocketData(); @@ -425,6 +426,8 @@ class DeterministicSocketData : public StaticSocketDataProvider, virtual void Reset(); + virtual void CompleteRead() {} + // Consume all the data up to the give stop point (via SetStop()). void Run(); @@ -442,7 +445,6 @@ class DeterministicSocketData : public StaticSocketDataProvider, virtual void StopAfter(int seq) { SetStop(sequence_number_ + seq); } - void CompleteRead(); bool stopped() const { return stopped_; } void SetStopped(bool val) { stopped_ = val; } MockRead& current_read() { return current_read_; } |