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

Side by Side Diff: net/http/http_stream_factory_impl_unittest.cc

Issue 895853003: Update from https://crrev.com/314320 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « net/http/http_stream_factory_impl_job.cc ('k') | net/http/transport_security_state_static.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 #include "net/http/http_stream_factory_impl.h" 5 #include "net/http/http_stream_factory_impl.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 1243 matching lines...) Expand 10 before | Expand all | Expand 10 after
1254 session(SpdySessionDependencies::SpdyCreateSessionDeterministic( 1254 session(SpdySessionDependencies::SpdyCreateSessionDeterministic(
1255 &session_deps)); 1255 &session_deps));
1256 1256
1257 // Now request a stream. 1257 // Now request a stream.
1258 HttpRequestInfo request_info; 1258 HttpRequestInfo request_info;
1259 request_info.method = "GET"; 1259 request_info.method = "GET";
1260 request_info.url = GURL("ws://www.google.com:8888"); 1260 request_info.url = GURL("ws://www.google.com:8888");
1261 request_info.load_flags = 0; 1261 request_info.load_flags = 0;
1262 1262
1263 session->http_server_properties()->SetAlternateProtocol( 1263 session->http_server_properties()->SetAlternateProtocol(
1264 HostPortPair("www.google.com", 8888), 1264 HostPortPair("www.google.com", 8888), 9999, NPN_SPDY_3, 1.0);
1265 9999,
1266 NPN_SPDY_3,
1267 1);
1268 1265
1269 SSLConfig ssl_config; 1266 SSLConfig ssl_config;
1270 StreamRequestWaiter waiter; 1267 StreamRequestWaiter waiter;
1271 WebSocketStreamCreateHelper create_helper; 1268 WebSocketStreamCreateHelper create_helper;
1272 scoped_ptr<HttpStreamRequest> request( 1269 scoped_ptr<HttpStreamRequest> request(
1273 session->http_stream_factory_for_websocket() 1270 session->http_stream_factory_for_websocket()
1274 ->RequestWebSocketHandshakeStream(request_info, 1271 ->RequestWebSocketHandshakeStream(request_info,
1275 DEFAULT_PRIORITY, 1272 DEFAULT_PRIORITY,
1276 ssl_config, 1273 ssl_config,
1277 ssl_config, 1274 ssl_config,
(...skipping 21 matching lines...) Expand all
1299 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); 1296 EXPECT_TRUE(waiter.used_proxy_info().is_direct());
1300 1297
1301 // Make sure there is no orphaned job. it is already canceled. 1298 // Make sure there is no orphaned job. it is already canceled.
1302 ASSERT_EQ(0u, static_cast<HttpStreamFactoryImpl*>( 1299 ASSERT_EQ(0u, static_cast<HttpStreamFactoryImpl*>(
1303 session->http_stream_factory_for_websocket())->num_orphaned_jobs()); 1300 session->http_stream_factory_for_websocket())->num_orphaned_jobs());
1304 } 1301 }
1305 1302
1306 } // namespace 1303 } // namespace
1307 1304
1308 } // namespace net 1305 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_stream_factory_impl_job.cc ('k') | net/http/transport_security_state_static.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698