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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/http_network_transaction_spdy3_unittest.cc

Issue 9959033: Move NextProto enum to a new file net/socket/next_proto.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address wtc's comments 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_network_transaction_spdy2_unittest.cc ('k') | net/http/http_pipelined_connection.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_network_transaction_spdy3_unittest.cc
diff --git a/net/http/http_network_transaction_spdy3_unittest.cc b/net/http/http_network_transaction_spdy3_unittest.cc
index 57e2179212033cc775a61afd29c74aa4dcd49b39..613be857cb5895bfcf99d044ab38f7657aa432d6 100644
--- a/net/http/http_network_transaction_spdy3_unittest.cc
+++ b/net/http/http_network_transaction_spdy3_unittest.cc
@@ -175,7 +175,7 @@ class HttpNetworkTransactionSpdy3Test : public PlatformTest {
};
virtual void SetUp() {
- SpdySession::set_default_protocol(SSLClientSocket::kProtoSPDY3);
+ SpdySession::set_default_protocol(kProtoSPDY3);
NetworkChangeNotifier::NotifyObserversOfIPAddressChangeForTests();
MessageLoop::current()->RunAllPending();
}
@@ -2171,7 +2171,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, HttpsProxySpdyGet) {
session_deps.socket_factory.AddSocketDataProvider(spdy_data.get());
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
+ ssl.SetNextProto(kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
TestCompletionCallback callback1;
@@ -2255,7 +2255,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, HttpsProxySpdyGetWithProxyAuth) {
session_deps.socket_factory.AddSocketDataProvider(data.get());
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
+ ssl.SetNextProto(kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
TestCompletionCallback callback1;
@@ -2350,11 +2350,11 @@ TEST_F(HttpNetworkTransactionSpdy3Test, HttpsProxySpdyConnectHttps) {
session_deps.socket_factory.AddSocketDataProvider(spdy_data.get());
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
+ ssl.SetNextProto(kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
SSLSocketDataProvider ssl2(ASYNC, OK);
ssl2.was_npn_negotiated = false;
- ssl2.protocol_negotiated = SSLClientSocket::kProtoUnknown;
+ ssl2.protocol_negotiated = kProtoUnknown;
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl2);
TestCompletionCallback callback1;
@@ -2429,11 +2429,11 @@ TEST_F(HttpNetworkTransactionSpdy3Test, HttpsProxySpdyConnectSpdy) {
session_deps.socket_factory.AddSocketDataProvider(spdy_data.get());
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
+ ssl.SetNextProto(kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
SSLSocketDataProvider ssl2(ASYNC, OK);
- ssl2.SetNextProto(SSLClientSocket::kProtoSPDY3);
- ssl2.protocol_negotiated = SSLClientSocket::kProtoSPDY3;
+ ssl2.SetNextProto(kProtoSPDY3);
+ ssl2.protocol_negotiated = kProtoSPDY3;
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl2);
TestCompletionCallback callback1;
@@ -2493,10 +2493,10 @@ TEST_F(HttpNetworkTransactionSpdy3Test, HttpsProxySpdyConnectFailure) {
session_deps.socket_factory.AddSocketDataProvider(spdy_data.get());
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
+ ssl.SetNextProto(kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
SSLSocketDataProvider ssl2(ASYNC, OK);
- ssl2.SetNextProto(SSLClientSocket::kProtoSPDY3);
+ ssl2.SetNextProto(kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl2);
TestCompletionCallback callback1;
@@ -4598,7 +4598,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, RedirectOfHttpsConnectViaSpdyProxy) {
data_reads, arraysize(data_reads),
data_writes, arraysize(data_writes)));
SSLSocketDataProvider proxy_ssl(ASYNC, OK); // SSL to the proxy
- proxy_ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
+ proxy_ssl.SetNextProto(kProtoSPDY3);
session_deps.socket_factory.AddSocketDataProvider(data.get());
session_deps.socket_factory.AddSSLSocketDataProvider(&proxy_ssl);
@@ -4717,7 +4717,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test,
data_reads, arraysize(data_reads),
data_writes, arraysize(data_writes)));
SSLSocketDataProvider proxy_ssl(ASYNC, OK); // SSL to the proxy
- proxy_ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
+ proxy_ssl.SetNextProto(kProtoSPDY3);
session_deps.socket_factory.AddSocketDataProvider(data.get());
session_deps.socket_factory.AddSSLSocketDataProvider(&proxy_ssl);
@@ -4827,7 +4827,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, BasicAuthSpdyProxy) {
session_deps.socket_factory.AddSocketDataProvider(spdy_data.get());
// Negotiate SPDY to the proxy
SSLSocketDataProvider proxy(ASYNC, OK);
- proxy.SetNextProto(SSLClientSocket::kProtoSPDY3);
+ proxy.SetNextProto(kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&proxy);
// Vanilla SSL to the server
SSLSocketDataProvider server(ASYNC, OK);
@@ -6917,7 +6917,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, UseAlternateProtocolForNpnSpdy) {
session_deps.socket_factory.AddSocketDataProvider(&first_transaction);
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
+ ssl.SetNextProto(kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
scoped_ptr<SpdyFrame> req(ConstructSpdyGet(NULL, 0, false, 1, LOWEST));
@@ -7016,7 +7016,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, AlternateProtocolWithSpdyLateBinding) {
session_deps.socket_factory.AddSocketDataProvider(&hanging_socket);
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
+ ssl.SetNextProto(kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
scoped_ptr<SpdyFrame> req1(ConstructSpdyGet(NULL, 0, false, 1, LOWEST));
@@ -7122,7 +7122,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, StallAlternateProtocolForNpnSpdy) {
session_deps.socket_factory.AddSocketDataProvider(&first_transaction);
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
+ ssl.SetNextProto(kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
MockConnect never_finishing_connect(SYNCHRONOUS, ERR_IO_PENDING);
@@ -7255,7 +7255,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test,
session_deps.socket_factory.AddSocketDataProvider(&first_transaction);
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
+ ssl.SetNextProto(kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
scoped_ptr<SpdyFrame> req(ConstructSpdyGet(NULL, 0, false, 1, LOWEST));
@@ -7359,7 +7359,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test,
session_deps.socket_factory.AddSocketDataProvider(&first_transaction);
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
+ ssl.SetNextProto(kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
scoped_ptr<SpdyFrame> req(ConstructSpdyGet(NULL, 0, false, 1, LOWEST));
@@ -8194,7 +8194,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, NpnWithHttpOverSSL) {
SSLSocketDataProvider ssl(ASYNC, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
ssl.next_proto = "http/1.1";
- ssl.protocol_negotiated = SSLClientSocket::kProtoHTTP11;
+ ssl.protocol_negotiated = kProtoHTTP11;
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
@@ -8242,7 +8242,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, SpdyPostNPNServerHangup) {
request.load_flags = 0;
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
+ ssl.SetNextProto(kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
scoped_ptr<SpdyFrame> req(ConstructSpdyGet(NULL, 0, false, 1, LOWEST));
@@ -8373,7 +8373,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, SpdyAlternateProtocolThroughProxy) {
data_writes_2, arraysize(data_writes_2)));
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
+ ssl.SetNextProto(kProtoSPDY3);
MockConnect never_finishing_connect(SYNCHRONOUS, ERR_IO_PENDING);
StaticSocketDataProvider hanging_non_alternate_protocol_socket(
@@ -8654,7 +8654,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, PreconnectWithExistingSpdySession) {
session_deps.socket_factory.AddSocketDataProvider(spdy_data.get());
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
+ ssl.SetNextProto(kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
@@ -9090,7 +9090,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, UseIPConnectionPooling) {
pool_peer.DisableDomainAuthenticationVerification();
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
+ ssl.SetNextProto(kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
scoped_ptr<SpdyFrame> host1_req(ConstructSpdyGet(
@@ -9241,7 +9241,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test,
pool_peer.DisableDomainAuthenticationVerification();
SSLSocketDataProvider ssl(ASYNC, OK);
- ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
+ ssl.SetNextProto(kProtoSPDY3);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
scoped_ptr<SpdyFrame> host1_req(ConstructSpdyGet(
« no previous file with comments | « net/http/http_network_transaction_spdy2_unittest.cc ('k') | net/http/http_pipelined_connection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698