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

Side by Side Diff: net/http/http_network_transaction.h

Issue 1453903002: Re-enable HTTP/2 over NPN (for OpenSSL). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Initialize |enable_npn| in other SpdySessionDependencies constructor. Created 5 years 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
« no previous file with comments | « net/http/http_network_session.cc ('k') | net/http/http_network_transaction_unittest.cc » ('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_HTTP_HTTP_NETWORK_TRANSACTION_H_ 5 #ifndef NET_HTTP_HTTP_NETWORK_TRANSACTION_H_
6 #define NET_HTTP_HTTP_NETWORK_TRANSACTION_H_ 6 #define NET_HTTP_HTTP_NETWORK_TRANSACTION_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 const ProxyInfo& used_proxy_info, 109 const ProxyInfo& used_proxy_info,
110 HttpStream* stream) override; 110 HttpStream* stream) override;
111 111
112 void GetConnectionAttempts(ConnectionAttempts* out) const override; 112 void GetConnectionAttempts(ConnectionAttempts* out) const override;
113 113
114 private: 114 private:
115 friend class HttpNetworkTransactionSSLTest; 115 friend class HttpNetworkTransactionSSLTest;
116 116
117 FRIEND_TEST_ALL_PREFIXES(HttpNetworkTransactionTest, 117 FRIEND_TEST_ALL_PREFIXES(HttpNetworkTransactionTest,
118 ResetStateForRestart); 118 ResetStateForRestart);
119 FRIEND_TEST_ALL_PREFIXES(HttpNetworkTransactionTest, EnableNPN);
120 FRIEND_TEST_ALL_PREFIXES(HttpNetworkTransactionTest, DisableNPN);
119 FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest, 121 FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest,
120 WindowUpdateReceived); 122 WindowUpdateReceived);
121 FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest, 123 FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest,
122 WindowUpdateSent); 124 WindowUpdateSent);
123 FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest, 125 FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest,
124 WindowUpdateOverflow); 126 WindowUpdateOverflow);
125 FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest, 127 FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest,
126 FlowControlStallResume); 128 FlowControlStallResume);
127 FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest, 129 FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest,
128 FlowControlStallResumeAfterSettings); 130 FlowControlStallResumeAfterSettings);
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 357
356 ConnectionAttempts connection_attempts_; 358 ConnectionAttempts connection_attempts_;
357 IPEndPoint remote_endpoint_; 359 IPEndPoint remote_endpoint_;
358 360
359 DISALLOW_COPY_AND_ASSIGN(HttpNetworkTransaction); 361 DISALLOW_COPY_AND_ASSIGN(HttpNetworkTransaction);
360 }; 362 };
361 363
362 } // namespace net 364 } // namespace net
363 365
364 #endif // NET_HTTP_HTTP_NETWORK_TRANSACTION_H_ 366 #endif // NET_HTTP_HTTP_NETWORK_TRANSACTION_H_
OLDNEW
« no previous file with comments | « net/http/http_network_session.cc ('k') | net/http/http_network_transaction_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698