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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/quic/quic_network_transaction_unittest.cc

Issue 1290243007: Shift URLRequestContextStorage over to taking scoped_ptrs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Paul_BuilderGrab
Patch Set: Lots of fixes driven by try jobs. Created 5 years, 4 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
« net/proxy/proxy_service_v8.h ('K') | « net/proxy/proxy_service_v8.cc ('k') | net/quic/test_tools/crypto_test_utils_chromium.cc » ('j') | net/quic/test_tools/crypto_test_utils_chromium.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_network_transaction_unittest.cc
diff --git a/net/quic/quic_network_transaction_unittest.cc b/net/quic/quic_network_transaction_unittest.cc
index af78fa76d4e1ef324449c01c5bfd8fa49b5d6bc8..e4abe8914637a8f459966e8a5b46af2736c4a21f 100644
--- a/net/quic/quic_network_transaction_unittest.cc
+++ b/net/quic/quic_network_transaction_unittest.cc
@@ -468,8 +468,7 @@ TEST_P(QuicNetworkTransactionTest, ForceQuic) {
TEST_P(QuicNetworkTransactionTest, QuicProxy) {
params_.enable_insecure_quic = true;
params_.enable_quic_for_proxies = true;
- proxy_service_.reset(
- ProxyService::CreateFixedFromPacResult("QUIC myproxy:70"));
+ proxy_service_ = ProxyService::CreateFixedFromPacResult("QUIC myproxy:70");
MockQuicData mock_quic_data;
mock_quic_data.AddWrite(
@@ -503,8 +502,8 @@ TEST_P(QuicNetworkTransactionTest, QuicProxyWithCert) {
params_.enable_insecure_quic = true;
params_.enable_quic_for_proxies = true;
- proxy_service_.reset(
- ProxyService::CreateFixedFromPacResult("QUIC " + proxy_host + ":70"));
+ proxy_service_ =
+ ProxyService::CreateFixedFromPacResult("QUIC " + proxy_host + ":70");
maker_.set_hostname(origin_host);
MockQuicData mock_quic_data;
@@ -1364,8 +1363,7 @@ TEST_P(QuicNetworkTransactionTest, ZeroRTTWithNoHttpRace) {
TEST_P(QuicNetworkTransactionTest, ZeroRTTWithProxy) {
params_.enable_insecure_quic = true;
- proxy_service_.reset(
- ProxyService::CreateFixedFromPacResult("PROXY myproxy:70"));
+ proxy_service_ = ProxyService::CreateFixedFromPacResult("PROXY myproxy:70");
// Since we are using a proxy, the QUIC job will not succeed.
MockWrite http_writes[] = {
« net/proxy/proxy_service_v8.h ('K') | « net/proxy/proxy_service_v8.cc ('k') | net/quic/test_tools/crypto_test_utils_chromium.cc » ('j') | net/quic/test_tools/crypto_test_utils_chromium.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698