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

Side by Side Diff: net/quic/quic_stream_factory.cc

Issue 47283002: Land Recent QUIC changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix compilation error Created 7 years, 1 month 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/quic/quic_session.h ('k') | net/quic/quic_stream_factory_test.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/quic/quic_stream_factory.h" 5 #include "net/quic/quic_stream_factory.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 new QuicDefaultPacketWriter(socket.get())); 443 new QuicDefaultPacketWriter(socket.get()));
444 444
445 if (!helper_.get()) { 445 if (!helper_.get()) {
446 helper_.reset(new QuicConnectionHelper( 446 helper_.reset(new QuicConnectionHelper(
447 base::MessageLoop::current()->message_loop_proxy().get(), 447 base::MessageLoop::current()->message_loop_proxy().get(),
448 clock_.get(), random_generator_)); 448 clock_.get(), random_generator_));
449 } 449 }
450 450
451 QuicConnection* connection = new QuicConnection(guid, addr, helper_.get(), 451 QuicConnection* connection = new QuicConnection(guid, addr, helper_.get(),
452 writer.get(), false, 452 writer.get(), false,
453 QuicVersionMax()); 453 QuicSupportedVersions());
454 writer->SetConnection(connection); 454 writer->SetConnection(connection);
455 455
456 QuicCryptoClientConfig* crypto_config = 456 QuicCryptoClientConfig* crypto_config =
457 GetOrCreateCryptoConfig(host_port_proxy_pair); 457 GetOrCreateCryptoConfig(host_port_proxy_pair);
458 DCHECK(crypto_config); 458 DCHECK(crypto_config);
459 459
460 QuicClientSession* session = 460 QuicClientSession* session =
461 new QuicClientSession(connection, socket.Pass(), writer.Pass(), this, 461 new QuicClientSession(connection, socket.Pass(), writer.Pass(), this,
462 quic_crypto_client_stream_factory_, 462 quic_crypto_client_stream_factory_,
463 host_port_proxy_pair.first.host(), config_, 463 host_port_proxy_pair.first.host(), config_,
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
529 DCHECK(canonical_crypto_config); 529 DCHECK(canonical_crypto_config);
530 530
531 // Copy the CachedState for the canonical server from canonical_crypto_config 531 // Copy the CachedState for the canonical server from canonical_crypto_config
532 // as the initial CachedState for the server_hostname in crypto_config. 532 // as the initial CachedState for the server_hostname in crypto_config.
533 crypto_config->InitializeFrom(server_hostname, 533 crypto_config->InitializeFrom(server_hostname,
534 canonical_host_port_proxy_pair.first.host(), 534 canonical_host_port_proxy_pair.first.host(),
535 canonical_crypto_config); 535 canonical_crypto_config);
536 } 536 }
537 537
538 } // namespace net 538 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/quic_session.h ('k') | net/quic/quic_stream_factory_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698