Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 | 6 |
| 7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 54 cert_verifier_.AddResultForCertAndHost(verify_result.verified_cert.get(), | 54 cert_verifier_.AddResultForCertAndHost(verify_result.verified_cert.get(), |
| 55 "test.example.com", verify_result, | 55 "test.example.com", verify_result, |
| 56 OK); | 56 OK); |
| 57 verify_result.verified_cert = ImportCertFromFile( | 57 verify_result.verified_cert = ImportCertFromFile( |
| 58 GetTestCertsDirectory(), "quic_test_ecc.example.com.crt"); | 58 GetTestCertsDirectory(), "quic_test_ecc.example.com.crt"); |
| 59 cert_verifier_.AddResultForCertAndHost(verify_result.verified_cert.get(), | 59 cert_verifier_.AddResultForCertAndHost(verify_result.verified_cert.get(), |
| 60 "test.example.com", verify_result, | 60 "test.example.com", verify_result, |
| 61 OK); | 61 OK); |
| 62 // To simplify the test, and avoid the race with the HTTP request, we force | 62 // To simplify the test, and avoid the race with the HTTP request, we force |
| 63 // QUIC for these requests. | 63 // QUIC for these requests. |
| 64 dynamic_shared_params_.reset(new HttpNetworkSession::DynamicSharedParams); | |
|
Bence
2016/12/20 14:58:07
= MakeUnique
pmarko
2016/12/20 18:00:37
Done.
| |
| 65 params->dynamic_shared_params = dynamic_shared_params_.get(); | |
| 64 params->origins_to_force_quic_on.insert( | 66 params->origins_to_force_quic_on.insert( |
| 65 HostPortPair::FromString(kTestServerHost)); | 67 HostPortPair::FromString(kTestServerHost)); |
| 66 params->cert_verifier = &cert_verifier_; | 68 params->cert_verifier = &cert_verifier_; |
| 67 params->enable_quic = true; | 69 dynamic_shared_params_->enable_quic = true; |
| 68 params->host_resolver = host_resolver_.get(); | 70 params->host_resolver = host_resolver_.get(); |
| 69 context_->set_http_network_session_params(std::move(params)); | 71 context_->set_http_network_session_params(std::move(params)); |
| 70 context_->set_cert_verifier(&cert_verifier_); | 72 context_->set_cert_verifier(&cert_verifier_); |
| 71 } | 73 } |
| 72 | 74 |
| 73 void TearDown() override { | 75 void TearDown() override { |
| 74 if (server_) | 76 if (server_) |
| 75 server_->Shutdown(); | 77 server_->Shutdown(); |
| 76 } | 78 } |
| 77 | 79 |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 119 std::string map_rule = "MAP test.example.com test.example.com:" + | 121 std::string map_rule = "MAP test.example.com test.example.com:" + |
| 120 base::IntToString(server_->server_address().port()); | 122 base::IntToString(server_->server_address().port()); |
| 121 EXPECT_TRUE(host_resolver_->AddRuleFromString(map_rule)); | 123 EXPECT_TRUE(host_resolver_->AddRuleFromString(map_rule)); |
| 122 } | 124 } |
| 123 | 125 |
| 124 std::unique_ptr<MappedHostResolver> host_resolver_; | 126 std::unique_ptr<MappedHostResolver> host_resolver_; |
| 125 std::unique_ptr<QuicSimpleServer> server_; | 127 std::unique_ptr<QuicSimpleServer> server_; |
| 126 std::unique_ptr<TestURLRequestContext> context_; | 128 std::unique_ptr<TestURLRequestContext> context_; |
| 127 QuicHttpResponseCache response_cache_; | 129 QuicHttpResponseCache response_cache_; |
| 128 MockCertVerifier cert_verifier_; | 130 MockCertVerifier cert_verifier_; |
| 131 std::unique_ptr<HttpNetworkSession::DynamicSharedParams> | |
| 132 dynamic_shared_params_; | |
| 129 }; | 133 }; |
| 130 | 134 |
| 131 // A URLRequest::Delegate that checks LoadTimingInfo when response headers are | 135 // A URLRequest::Delegate that checks LoadTimingInfo when response headers are |
| 132 // received. | 136 // received. |
| 133 class CheckLoadTimingDelegate : public TestDelegate { | 137 class CheckLoadTimingDelegate : public TestDelegate { |
| 134 public: | 138 public: |
| 135 CheckLoadTimingDelegate(bool session_reused) | 139 CheckLoadTimingDelegate(bool session_reused) |
| 136 : session_reused_(session_reused) {} | 140 : session_reused_(session_reused) {} |
| 137 void OnResponseStarted(URLRequest* request, int error) override { | 141 void OnResponseStarted(URLRequest* request, int error) override { |
| 138 TestDelegate::OnResponseStarted(request, error); | 142 TestDelegate::OnResponseStarted(request, error); |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 237 ASSERT_TRUE(request2->is_pending()); | 241 ASSERT_TRUE(request2->is_pending()); |
| 238 run_loop.Run(); | 242 run_loop.Run(); |
| 239 | 243 |
| 240 EXPECT_TRUE(request->status().is_success()); | 244 EXPECT_TRUE(request->status().is_success()); |
| 241 EXPECT_TRUE(request2->status().is_success()); | 245 EXPECT_TRUE(request2->status().is_success()); |
| 242 EXPECT_EQ(kHelloBodyValue, delegate.data_received()); | 246 EXPECT_EQ(kHelloBodyValue, delegate.data_received()); |
| 243 EXPECT_EQ(kHelloBodyValue, delegate2.data_received()); | 247 EXPECT_EQ(kHelloBodyValue, delegate2.data_received()); |
| 244 } | 248 } |
| 245 | 249 |
| 246 } // namespace net | 250 } // namespace net |
| OLD | NEW |