OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "content/browser/loader/resource_loader.h" | 5 #include "content/browser/loader/resource_loader.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <memory> | 10 #include <memory> |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 #include "net/base/upload_bytes_element_reader.h" | 42 #include "net/base/upload_bytes_element_reader.h" |
43 #include "net/cert/x509_certificate.h" | 43 #include "net/cert/x509_certificate.h" |
44 #include "net/nqe/effective_connection_type.h" | 44 #include "net/nqe/effective_connection_type.h" |
45 #include "net/nqe/network_quality_estimator.h" | 45 #include "net/nqe/network_quality_estimator.h" |
46 #include "net/ssl/client_cert_store.h" | 46 #include "net/ssl/client_cert_store.h" |
47 #include "net/ssl/ssl_cert_request_info.h" | 47 #include "net/ssl/ssl_cert_request_info.h" |
48 #include "net/ssl/ssl_private_key.h" | 48 #include "net/ssl/ssl_private_key.h" |
49 #include "net/test/cert_test_util.h" | 49 #include "net/test/cert_test_util.h" |
50 #include "net/test/embedded_test_server/embedded_test_server.h" | 50 #include "net/test/embedded_test_server/embedded_test_server.h" |
51 #include "net/test/test_data_directory.h" | 51 #include "net/test/test_data_directory.h" |
| 52 #include "net/url_request/http_protocol_handler.h" |
52 #include "net/url_request/url_request.h" | 53 #include "net/url_request/url_request.h" |
53 #include "net/url_request/url_request_filter.h" | 54 #include "net/url_request/url_request_filter.h" |
54 #include "net/url_request/url_request_interceptor.h" | 55 #include "net/url_request/url_request_interceptor.h" |
55 #include "net/url_request/url_request_job_factory.h" | 56 #include "net/url_request/url_request_job_factory.h" |
56 #include "net/url_request/url_request_job_factory_impl.h" | 57 #include "net/url_request/url_request_job_factory_impl.h" |
57 #include "net/url_request/url_request_test_job.h" | 58 #include "net/url_request/url_request_test_job.h" |
58 #include "net/url_request/url_request_test_util.h" | 59 #include "net/url_request/url_request_test_util.h" |
59 #include "storage/browser/blob/shareable_file_reference.h" | 60 #include "storage/browser/blob/shareable_file_reference.h" |
60 #include "testing/gtest/include/gtest/gtest.h" | 61 #include "testing/gtest/include/gtest/gtest.h" |
61 | 62 |
(...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
548 net::EffectiveConnectionType type_; | 549 net::EffectiveConnectionType type_; |
549 | 550 |
550 DISALLOW_COPY_AND_ASSIGN(TestNetworkQualityEstimator); | 551 DISALLOW_COPY_AND_ASSIGN(TestNetworkQualityEstimator); |
551 }; | 552 }; |
552 | 553 |
553 class ResourceLoaderTest : public testing::Test, | 554 class ResourceLoaderTest : public testing::Test, |
554 public ResourceLoaderDelegate { | 555 public ResourceLoaderDelegate { |
555 protected: | 556 protected: |
556 ResourceLoaderTest() | 557 ResourceLoaderTest() |
557 : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP), | 558 : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP), |
| 559 job_factory_( |
| 560 net::URLRequestJobFactoryImpl::CreateWithHttpProtocolHandlers()), |
558 test_url_request_context_(true), | 561 test_url_request_context_(true), |
559 resource_context_(&test_url_request_context_), | 562 resource_context_(&test_url_request_context_), |
560 raw_ptr_resource_handler_(NULL), | 563 raw_ptr_resource_handler_(NULL), |
561 raw_ptr_to_request_(NULL) { | 564 raw_ptr_to_request_(NULL) { |
562 test_url_request_context_.set_job_factory(&job_factory_); | 565 test_url_request_context_.set_job_factory(job_factory_.get()); |
563 test_url_request_context_.set_network_quality_estimator( | 566 test_url_request_context_.set_network_quality_estimator( |
564 &network_quality_estimator_); | 567 &network_quality_estimator_); |
565 test_url_request_context_.Init(); | 568 test_url_request_context_.Init(); |
566 } | 569 } |
567 | 570 |
568 GURL test_url() const { return net::URLRequestTestJob::test_url_1(); } | 571 GURL test_url() const { return net::URLRequestTestJob::test_url_1(); } |
569 | 572 |
570 TestNetworkQualityEstimator* network_quality_estimator() { | 573 TestNetworkQualityEstimator* network_quality_estimator() { |
571 return &network_quality_estimator_; | 574 return &network_quality_estimator_; |
572 } | 575 } |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
607 std::unique_ptr<ResourceHandlerStub> resource_handler( | 610 std::unique_ptr<ResourceHandlerStub> resource_handler( |
608 new ResourceHandlerStub(request.get())); | 611 new ResourceHandlerStub(request.get())); |
609 raw_ptr_resource_handler_ = resource_handler.get(); | 612 raw_ptr_resource_handler_ = resource_handler.get(); |
610 loader_.reset(new ResourceLoader( | 613 loader_.reset(new ResourceLoader( |
611 std::move(request), | 614 std::move(request), |
612 WrapResourceHandler(std::move(resource_handler), raw_ptr_to_request_), | 615 WrapResourceHandler(std::move(resource_handler), raw_ptr_to_request_), |
613 this)); | 616 this)); |
614 } | 617 } |
615 | 618 |
616 void SetUp() override { | 619 void SetUp() override { |
617 job_factory_.SetProtocolHandler("test", CreateProtocolHandler()); | 620 job_factory_->SetProtocolHandler("test", CreateProtocolHandler()); |
618 | 621 |
619 browser_context_.reset(new TestBrowserContext()); | 622 browser_context_.reset(new TestBrowserContext()); |
620 scoped_refptr<SiteInstance> site_instance = | 623 scoped_refptr<SiteInstance> site_instance = |
621 SiteInstance::Create(browser_context_.get()); | 624 SiteInstance::Create(browser_context_.get()); |
622 web_contents_.reset( | 625 web_contents_.reset( |
623 TestWebContents::Create(browser_context_.get(), site_instance.get())); | 626 TestWebContents::Create(browser_context_.get(), site_instance.get())); |
624 | 627 |
625 std::unique_ptr<net::URLRequest> request( | 628 std::unique_ptr<net::URLRequest> request( |
626 resource_context_.GetRequestContext()->CreateRequest( | 629 resource_context_.GetRequestContext()->CreateRequest( |
627 test_url(), net::DEFAULT_PRIORITY, nullptr /* delegate */)); | 630 test_url(), net::DEFAULT_PRIORITY, nullptr /* delegate */)); |
(...skipping 29 matching lines...) Expand all Loading... |
657 void DidReceiveResponse(ResourceLoader* loader) override {} | 660 void DidReceiveResponse(ResourceLoader* loader) override {} |
658 void DidFinishLoading(ResourceLoader* loader) override {} | 661 void DidFinishLoading(ResourceLoader* loader) override {} |
659 std::unique_ptr<net::ClientCertStore> CreateClientCertStore( | 662 std::unique_ptr<net::ClientCertStore> CreateClientCertStore( |
660 ResourceLoader* loader) override { | 663 ResourceLoader* loader) override { |
661 return std::move(dummy_cert_store_); | 664 return std::move(dummy_cert_store_); |
662 } | 665 } |
663 | 666 |
664 TestBrowserThreadBundle thread_bundle_; | 667 TestBrowserThreadBundle thread_bundle_; |
665 RenderViewHostTestEnabler rvh_test_enabler_; | 668 RenderViewHostTestEnabler rvh_test_enabler_; |
666 | 669 |
667 net::URLRequestJobFactoryImpl job_factory_; | 670 std::unique_ptr<net::URLRequestJobFactoryImpl> job_factory_; |
668 TestNetworkQualityEstimator network_quality_estimator_; | 671 TestNetworkQualityEstimator network_quality_estimator_; |
669 net::TestURLRequestContext test_url_request_context_; | 672 net::TestURLRequestContext test_url_request_context_; |
670 MockResourceContext resource_context_; | 673 MockResourceContext resource_context_; |
671 std::unique_ptr<TestBrowserContext> browser_context_; | 674 std::unique_ptr<TestBrowserContext> browser_context_; |
672 std::unique_ptr<TestWebContents> web_contents_; | 675 std::unique_ptr<TestWebContents> web_contents_; |
673 std::unique_ptr<net::ClientCertStore> dummy_cert_store_; | 676 std::unique_ptr<net::ClientCertStore> dummy_cert_store_; |
674 | 677 |
675 // The ResourceLoader owns the URLRequest and the ResourceHandler. | 678 // The ResourceLoader owns the URLRequest and the ResourceHandler. |
676 ResourceHandlerStub* raw_ptr_resource_handler_; | 679 ResourceHandlerStub* raw_ptr_resource_handler_; |
677 net::URLRequest* raw_ptr_to_request_; | 680 net::URLRequest* raw_ptr_to_request_; |
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1159 | 1162 |
1160 // Tests that the effective connection type is not set on non-main frame | 1163 // Tests that the effective connection type is not set on non-main frame |
1161 // requests. | 1164 // requests. |
1162 TEST_F(EffectiveConnectionTypeResourceLoaderTest, DoesNotBelongToMainFrame) { | 1165 TEST_F(EffectiveConnectionTypeResourceLoaderTest, DoesNotBelongToMainFrame) { |
1163 VerifyEffectiveConnectionType(RESOURCE_TYPE_OBJECT, false, | 1166 VerifyEffectiveConnectionType(RESOURCE_TYPE_OBJECT, false, |
1164 net::EFFECTIVE_CONNECTION_TYPE_3G, | 1167 net::EFFECTIVE_CONNECTION_TYPE_3G, |
1165 net::EFFECTIVE_CONNECTION_TYPE_UNKNOWN); | 1168 net::EFFECTIVE_CONNECTION_TYPE_UNKNOWN); |
1166 } | 1169 } |
1167 | 1170 |
1168 } // namespace content | 1171 } // namespace content |
OLD | NEW |