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

Side by Side Diff: net/spdy/spdy_network_transaction_spdy3_unittest.cc

Issue 10005041: Remove SPDY 2.1 support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove references to deleted flags from chrome/browser Created 8 years, 8 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_network_transaction_spdy2_unittest.cc ('k') | net/spdy/spdy_session.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 #include "net/http/http_network_transaction.h" 5 #include "net/http/http_network_transaction.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 if (!session_.get()) 112 if (!session_.get())
113 session_ = SpdySessionDependencies::SpdyCreateSession( 113 session_ = SpdySessionDependencies::SpdyCreateSession(
114 session_deps_.get()); 114 session_deps_.get());
115 HttpStreamFactory::set_use_alternate_protocols(false); 115 HttpStreamFactory::set_use_alternate_protocols(false);
116 HttpStreamFactory::set_force_spdy_over_ssl(false); 116 HttpStreamFactory::set_force_spdy_over_ssl(false);
117 HttpStreamFactory::set_force_spdy_always(false); 117 HttpStreamFactory::set_force_spdy_always(false);
118 118
119 std::vector<std::string> next_protos; 119 std::vector<std::string> next_protos;
120 next_protos.push_back("http/1.1"); 120 next_protos.push_back("http/1.1");
121 next_protos.push_back("spdy/2"); 121 next_protos.push_back("spdy/2");
122 next_protos.push_back("spdy/2.1");
123 next_protos.push_back("spdy/3"); 122 next_protos.push_back("spdy/3");
124 123
125 switch (test_type_) { 124 switch (test_type_) {
126 case SPDYNPN: 125 case SPDYNPN:
127 session_->http_server_properties()->SetAlternateProtocol( 126 session_->http_server_properties()->SetAlternateProtocol(
128 HostPortPair("www.google.com", 80), 443, 127 HostPortPair("www.google.com", 80), 443,
129 NPN_SPDY_3); 128 NPN_SPDY_3);
130 HttpStreamFactory::set_use_alternate_protocols(true); 129 HttpStreamFactory::set_use_alternate_protocols(true);
131 HttpStreamFactory::SetNextProtos(next_protos); 130 HttpStreamFactory::SetNextProtos(next_protos);
132 break; 131 break;
(...skipping 5815 matching lines...) Expand 10 before | Expand all | Expand 10 after
5948 << " Write index: " 5947 << " Write index: "
5949 << data->write_index(); 5948 << data->write_index();
5950 5949
5951 // Verify the SYN_REPLY. 5950 // Verify the SYN_REPLY.
5952 HttpResponseInfo response = *trans->GetResponseInfo(); 5951 HttpResponseInfo response = *trans->GetResponseInfo();
5953 EXPECT_TRUE(response.headers != NULL); 5952 EXPECT_TRUE(response.headers != NULL);
5954 EXPECT_EQ("HTTP/1.1 200 OK", response.headers->GetStatusLine()); 5953 EXPECT_EQ("HTTP/1.1 200 OK", response.headers->GetStatusLine());
5955 } 5954 }
5956 5955
5957 } // namespace net 5956 } // namespace net
OLDNEW
« no previous file with comments | « net/spdy/spdy_network_transaction_spdy2_unittest.cc ('k') | net/spdy/spdy_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698