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

Side by Side Diff: net/spdy/spdy_session.h

Issue 12743006: [SPDY] Refactor tests in preparation for a fix for a session flow control bug (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 7 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef NET_SPDY_SPDY_SESSION_H_ 5 #ifndef NET_SPDY_SPDY_SESSION_H_
6 #define NET_SPDY_SPDY_SESSION_H_ 6 #define NET_SPDY_SPDY_SESSION_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <list> 9 #include <list>
10 #include <map> 10 #include <map>
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test, GetActivePushStream); 452 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test, GetActivePushStream);
453 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test, DeleteExpiredPushStreams); 453 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test, DeleteExpiredPushStreams);
454 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test, ProtocolNegotiation); 454 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test, ProtocolNegotiation);
455 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test, ProtocolNegotiation31); 455 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test, ProtocolNegotiation31);
456 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test, IncreaseRecvWindowSize); 456 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test, IncreaseRecvWindowSize);
457 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test, AdjustRecvWindowSize31); 457 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test, AdjustRecvWindowSize31);
458 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test, AdjustSendWindowSize31); 458 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test, AdjustSendWindowSize31);
459 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test, 459 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test,
460 SessionFlowControlInactiveStream31); 460 SessionFlowControlInactiveStream31);
461 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test, SessionFlowControlEndToEnd31); 461 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test, SessionFlowControlEndToEnd31);
462 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test,
463 ResumeAfterSendWindowSizeIncrease31);
464 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test,
465 ResumeByPriorityAfterSendWindowSizeIncrease31);
462 466
463 typedef std::deque<SpdyStreamRequest*> PendingStreamRequestQueue; 467 typedef std::deque<SpdyStreamRequest*> PendingStreamRequestQueue;
464 typedef std::set<SpdyStreamRequest*> PendingStreamRequestCompletionSet; 468 typedef std::set<SpdyStreamRequest*> PendingStreamRequestCompletionSet;
465 469
466 typedef std::map<int, scoped_refptr<SpdyStream> > ActiveStreamMap; 470 typedef std::map<int, scoped_refptr<SpdyStream> > ActiveStreamMap;
467 typedef std::map<std::string, 471 typedef std::map<std::string,
468 std::pair<scoped_refptr<SpdyStream>, base::TimeTicks> > PushedStreamMap; 472 std::pair<scoped_refptr<SpdyStream>, base::TimeTicks> > PushedStreamMap;
469 typedef std::priority_queue<SpdyIOBuffer> OutputQueue; 473 typedef std::priority_queue<SpdyIOBuffer> OutputQueue;
470 474
471 typedef std::set<scoped_refptr<SpdyStream> > CreatedStreamSet; 475 typedef std::set<scoped_refptr<SpdyStream> > CreatedStreamSet;
(...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after
880 // This SPDY proxy is allowed to push resources from origins that are 884 // This SPDY proxy is allowed to push resources from origins that are
881 // different from those of their associated streams. 885 // different from those of their associated streams.
882 HostPortPair trusted_spdy_proxy_; 886 HostPortPair trusted_spdy_proxy_;
883 887
884 TimeFunc time_func_; 888 TimeFunc time_func_;
885 }; 889 };
886 890
887 } // namespace net 891 } // namespace net
888 892
889 #endif // NET_SPDY_SPDY_SESSION_H_ 893 #endif // NET_SPDY_SPDY_SESSION_H_
OLDNEW
« no previous file with comments | « net/spdy/spdy_proxy_client_socket_spdy3_unittest.cc ('k') | net/spdy/spdy_session_spdy3_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698