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

Unified Diff: net/spdy/spdy_session_pool.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/spdy/spdy_session.h ('k') | net/spdy/spdy_session_spdy2_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_session_pool.h
===================================================================
--- net/spdy/spdy_session_pool.h (revision 124866)
+++ net/spdy/spdy_session_pool.h (working copy)
@@ -34,6 +34,14 @@
class HttpServerProperties;
class SpdySession;
+namespace test_spdy2 {
+class SpdySessionPoolPeer;
+} // namespace test_spdy
+
+namespace test_spdy3 {
+class SpdySessionPoolPeer;
+} // namespace test_spdy
+
// This is a very simple pool for open SpdySessions.
class NET_EXPORT SpdySessionPool
: public NetworkChangeNotifier::IPAddressObserver,
@@ -135,9 +143,17 @@
virtual void OnCertTrustChanged(const X509Certificate* cert) OVERRIDE;
private:
- friend class SpdySessionPoolPeer; // For testing.
- friend class SpdyNetworkTransactionTest; // For testing.
- FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest, WindowUpdateOverflow);
+ friend class test_spdy2::SpdySessionPoolPeer; // For testing.
+ friend class test_spdy3::SpdySessionPoolPeer; // For testing.
+ friend class SpdyNetworkTransactionSpdy2Test; // For testing.
+ friend class SpdyNetworkTransactionSpdy21Test; // For testing.
+ friend class SpdyNetworkTransactionSpdy3Test; // For testing.
+ FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy2Test,
+ WindowUpdateOverflow);
+ FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy21Test,
+ WindowUpdateOverflow);
+ FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy3Test,
+ WindowUpdateOverflow);
typedef std::list<scoped_refptr<SpdySession> > SpdySessionList;
typedef std::map<HostPortProxyPair, SpdySessionList*> SpdySessionsMap;
« no previous file with comments | « net/spdy/spdy_session.h ('k') | net/spdy/spdy_session_spdy2_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698