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

Unified Diff: net/http/http_network_transaction.h

Issue 9582034: Fork SPDY/2 and SPDY/3 versions of our SPDY tests, in preparation for landing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fix merge bug Created 8 years, 10 months 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/base/upload_data.h ('k') | net/http/http_network_transaction_spdy21_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_network_transaction.h
===================================================================
--- net/http/http_network_transaction.h (revision 124866)
+++ net/http/http_network_transaction.h (working copy)
@@ -85,11 +85,36 @@
HttpStream* stream) OVERRIDE;
private:
- FRIEND_TEST_ALL_PREFIXES(HttpNetworkTransactionTest, ResetStateForRestart);
- FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest, WindowUpdateReceived);
- FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest, WindowUpdateSent);
- FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest, WindowUpdateOverflow);
- FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest, FlowControlStallResume);
+ FRIEND_TEST_ALL_PREFIXES(HttpNetworkTransactionSpdy2Test,
+ ResetStateForRestart);
+ FRIEND_TEST_ALL_PREFIXES(HttpNetworkTransactionSpdy21Test,
+ ResetStateForRestart);
+ FRIEND_TEST_ALL_PREFIXES(HttpNetworkTransactionSpdy3Test,
+ ResetStateForRestart);
+ FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy2Test,
+ WindowUpdateReceived);
+ FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy2Test,
+ WindowUpdateSent);
+ FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy2Test,
+ WindowUpdateOverflow);
+ FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy2Test,
+ FlowControlStallResume);
+ FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy21Test,
+ WindowUpdateReceived);
+ FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy21Test,
+ WindowUpdateSent);
+ FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy21Test,
+ WindowUpdateOverflow);
+ FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy21Test,
+ FlowControlStallResume);
+ FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy3Test,
+ WindowUpdateReceived);
+ FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy3Test,
+ WindowUpdateSent);
+ FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy3Test,
+ WindowUpdateOverflow);
+ FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy3Test,
+ FlowControlStallResume);
enum State {
STATE_CREATE_STREAM,
« no previous file with comments | « net/base/upload_data.h ('k') | net/http/http_network_transaction_spdy21_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698