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

Side by Side Diff: net/spdy/spdy_session.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, 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
« no previous file with comments | « net/spdy/spdy_proxy_client_socket_unittest.cc ('k') | net/spdy/spdy_session_pool.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #pragma once 7 #pragma once
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <list> 10 #include <list>
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 int GetLocalAddress(IPEndPoint* address) const; 277 int GetLocalAddress(IPEndPoint* address) const;
278 278
279 // Returns true if a request for a resource in |origin| requires a 279 // Returns true if a request for a resource in |origin| requires a
280 // SPDY CREDENTIAL frame to be sent first, with an origin bound certificate. 280 // SPDY CREDENTIAL frame to be sent first, with an origin bound certificate.
281 bool NeedsCredentials(const HostPortPair& origin) const; 281 bool NeedsCredentials(const HostPortPair& origin) const;
282 282
283 private: 283 private:
284 friend class base::RefCounted<SpdySession>; 284 friend class base::RefCounted<SpdySession>;
285 285
286 // Allow tests to access our innards for testing purposes. 286 // Allow tests to access our innards for testing purposes.
287 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, Ping); 287 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy2Test, Ping);
288 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, FailedPing); 288 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy2Test, FailedPing);
289 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, GetActivePushStream); 289 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy2Test, GetActivePushStream);
290 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test, Ping);
291 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test, FailedPing);
292 FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test, GetActivePushStream);
290 293
291 struct PendingCreateStream { 294 struct PendingCreateStream {
292 PendingCreateStream(const GURL& url, RequestPriority priority, 295 PendingCreateStream(const GURL& url, RequestPriority priority,
293 scoped_refptr<SpdyStream>* spdy_stream, 296 scoped_refptr<SpdyStream>* spdy_stream,
294 const BoundNetLog& stream_net_log, 297 const BoundNetLog& stream_net_log,
295 const CompletionCallback& callback) 298 const CompletionCallback& callback)
296 : url(&url), 299 : url(&url),
297 priority(priority), 300 priority(priority),
298 spdy_stream(spdy_stream), 301 spdy_stream(spdy_stream),
299 stream_net_log(&stream_net_log), 302 stream_net_log(&stream_net_log),
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
705 708
706 const int status_; 709 const int status_;
707 const std::string description_; 710 const std::string description_;
708 711
709 DISALLOW_COPY_AND_ASSIGN(NetLogSpdySessionCloseParameter); 712 DISALLOW_COPY_AND_ASSIGN(NetLogSpdySessionCloseParameter);
710 }; 713 };
711 714
712 } // namespace net 715 } // namespace net
713 716
714 #endif // NET_SPDY_SPDY_SESSION_H_ 717 #endif // NET_SPDY_SPDY_SESSION_H_
OLDNEW
« no previous file with comments | « net/spdy/spdy_proxy_client_socket_unittest.cc ('k') | net/spdy/spdy_session_pool.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698