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

Unified Diff: net/quic/quic_http_stream_test.cc

Issue 944883003: QUIC - Cache the connection type and connection description. Make the (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removed const char* const as return value to fix ios_rel_device_ninja_ng compile error 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 side-by-side diff with in-line comments
Download patch
Index: net/quic/quic_http_stream_test.cc
diff --git a/net/quic/quic_http_stream_test.cc b/net/quic/quic_http_stream_test.cc
index 5b69e469bf04ebb897149a9178d8f5a210483f27..6e6b251564e924c209aa2b741ceb131f11631e86 100644
--- a/net/quic/quic_http_stream_test.cc
+++ b/net/quic/quic_http_stream_test.cc
@@ -18,6 +18,7 @@
#include "net/quic/crypto/quic_decrypter.h"
#include "net/quic/crypto/quic_encrypter.h"
#include "net/quic/crypto/quic_server_info.h"
+#include "net/quic/network_connection.h"
#include "net/quic/quic_client_session.h"
#include "net/quic/quic_connection.h"
#include "net/quic/quic_connection_helper.h"
@@ -206,16 +207,11 @@ class QuicHttpStreamTest : public ::testing::TestWithParam<QuicVersion> {
helper_.get(), writer_factory);
connection_->set_visitor(&visitor_);
connection_->SetSendAlgorithm(send_algorithm_);
- session_.reset(
- new QuicClientSession(connection_,
- scoped_ptr<DatagramClientSocket>(socket),
- nullptr,
- &transport_security_state_,
- make_scoped_ptr((QuicServerInfo*)nullptr),
- DefaultQuicConfig(),
- base::MessageLoop::current()->
- message_loop_proxy().get(),
- nullptr));
+ session_.reset(new QuicClientSession(
+ connection_, scoped_ptr<DatagramClientSocket>(socket), nullptr,
+ &transport_security_state_, make_scoped_ptr((QuicServerInfo*)nullptr),
+ DefaultQuicConfig(), network_connection_.GetDescription(),
Ryan Hamilton 2015/02/23 20:42:19 ditto
ramant (doing other things) 2015/02/23 21:05:30 Done.
+ base::MessageLoop::current()->message_loop_proxy().get(), nullptr));
session_->InitializeSession(QuicServerId(kServerHostname, kServerPort,
/*is_secure=*/false,
PRIVACY_MODE_DISABLED),
@@ -320,6 +316,7 @@ class QuicHttpStreamTest : public ::testing::TestWithParam<QuicVersion> {
IPEndPoint peer_addr_;
MockRandom random_generator_;
MockCryptoClientStreamFactory crypto_client_stream_factory_;
+ NetworkConnection network_connection_;
scoped_ptr<StaticSocketDataProvider> socket_data_;
std::vector<PacketToWrite> writes_;
};

Powered by Google App Engine
This is Rietveld 408576698