Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(501)

Unified Diff: net/spdy/spdy_test_util_common.h

Issue 1411383005: Initial implementation of RequestPriority-based HTTP/2 dependencies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Final round of comments. Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/spdy/spdy_stream_unittest.cc ('k') | net/spdy/spdy_test_util_common.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_test_util_common.h
diff --git a/net/spdy/spdy_test_util_common.h b/net/spdy/spdy_test_util_common.h
index 7a3d272cb9ce9146e6c1403ed6d8495ef2301508..90c5ef6b447bd58505b7ee290f6f756ac632d8d3 100644
--- a/net/spdy/spdy_test_util_common.h
+++ b/net/spdy/spdy_test_util_common.h
@@ -298,7 +298,8 @@ class SpdySessionPoolPeer {
class SpdyTestUtil {
public:
- explicit SpdyTestUtil(NextProto protocol);
+ explicit SpdyTestUtil(NextProto protocol, bool dependency_priorities);
+ ~SpdyTestUtil();
// Add the appropriate headers to put |url| into |block|.
void AddUrlToHeaderBlock(base::StringPiece url,
@@ -413,7 +414,7 @@ class SpdyTestUtil {
SpdyFrame* ConstructSpdyGet(const char* const url,
bool compressed,
SpdyStreamId stream_id,
- RequestPriority request_priority) const;
+ RequestPriority request_priority);
SpdyFrame* ConstructSpdyGetForProxy(const char* const url,
bool compressed,
@@ -430,14 +431,14 @@ class SpdyTestUtil {
bool compressed,
int stream_id,
RequestPriority request_priority,
- bool direct) const;
+ bool direct);
// Constructs a standard SPDY SYN_STREAM frame for a CONNECT request.
SpdyFrame* ConstructSpdyConnect(const char* const extra_headers[],
int extra_header_count,
int stream_id,
RequestPriority priority,
- const HostPortPair& host_port_pair) const;
+ const HostPortPair& host_port_pair);
// Constructs a standard SPDY push SYN frame.
// |extra_headers| are the extra header-value pairs, which typically
@@ -474,7 +475,7 @@ class SpdyTestUtil {
const SpdyHeaderBlock& headers,
RequestPriority priority,
bool compressed,
- bool fin) const;
+ bool fin);
// Construct a SPDY reply (HEADERS or SYN_REPLY, depending on protocol
// version) carrying exactly the given headers, and the default priority
@@ -552,6 +553,11 @@ class SpdyTestUtil {
SpdyFrame* ConstructWrappedSpdyFrame(const scoped_ptr<SpdyFrame>& frame,
int stream_id);
+ // Called when necessary (when it will affect stream dependency specification
+ // when setting dependencies based on priorioties) to notify the utility
+ // class of stream destruction.
+ void UpdateWithStreamDestruction(int stream_id);
+
const SpdyHeaderInfo MakeSpdyHeader(SpdyFrameType type);
// For versions below SPDY4, adds the version HTTP/1.1 header.
@@ -587,6 +593,10 @@ class SpdyTestUtil {
const NextProto protocol_;
const SpdyMajorVersion spdy_version_;
GURL default_url_;
+ bool dependency_priorities_;
+
+ // Track a FIFO list of the stream_id of all created requests by priority.
+ std::map<int, std::vector<int>> priority_to_stream_id_list_;
};
} // namespace net
« no previous file with comments | « net/spdy/spdy_stream_unittest.cc ('k') | net/spdy/spdy_test_util_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698