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

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

Issue 2026863002: Disable AltSvc from insecure origin. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
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 <memory> 5 #include <memory>
6 #include <ostream> 6 #include <ostream>
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 random_generator_(0), 256 random_generator_(0),
257 ssl_data_(ASYNC, OK) { 257 ssl_data_(ASYNC, OK) {
258 request_.method = "GET"; 258 request_.method = "GET";
259 std::string url("https://"); 259 std::string url("https://");
260 url.append(kDefaultServerHostName); 260 url.append(kDefaultServerHostName);
261 request_.url = GURL(url); 261 request_.url = GURL(url);
262 request_.load_flags = 0; 262 request_.load_flags = 0;
263 clock_->AdvanceTime(QuicTime::Delta::FromMilliseconds(20)); 263 clock_->AdvanceTime(QuicTime::Delta::FromMilliseconds(20));
264 264
265 params_.enable_alternative_service_with_different_host = true; 265 params_.enable_alternative_service_with_different_host = true;
266 params_.enable_alternative_service_for_insecure_origins = true;
Ryan Hamilton 2016/05/31 23:43:42 I'm surprised we have any of these left since I th
Bence 2016/06/01 10:54:38 It's only SetAlternativeServicesWithScheme, should
266 267
267 scoped_refptr<X509Certificate> cert( 268 scoped_refptr<X509Certificate> cert(
268 ImportCertFromFile(GetTestCertsDirectory(), "wildcard.pem")); 269 ImportCertFromFile(GetTestCertsDirectory(), "wildcard.pem"));
269 verify_details_.cert_verify_result.verified_cert = cert; 270 verify_details_.cert_verify_result.verified_cert = cert;
270 verify_details_.cert_verify_result.is_issued_by_known_root = true; 271 verify_details_.cert_verify_result.is_issued_by_known_root = true;
271 crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details_); 272 crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details_);
272 } 273 }
273 274
274 void SetUp() override { 275 void SetUp() override {
275 NetworkChangeNotifier::NotifyObserversOfIPAddressChangeForTests(); 276 NetworkChangeNotifier::NotifyObserversOfIPAddressChangeForTests();
(...skipping 2280 matching lines...) Expand 10 before | Expand all | Expand 10 after
2556 AddHangingSocketData(); 2557 AddHangingSocketData();
2557 2558
2558 SendRequestAndExpectQuicResponse(origin1_); 2559 SendRequestAndExpectQuicResponse(origin1_);
2559 SendRequestAndExpectQuicResponse(origin2_); 2560 SendRequestAndExpectQuicResponse(origin2_);
2560 2561
2561 EXPECT_TRUE(AllDataConsumed()); 2562 EXPECT_TRUE(AllDataConsumed());
2562 } 2563 }
2563 2564
2564 } // namespace test 2565 } // namespace test
2565 } // namespace net 2566 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698