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

Side by Side Diff: content/browser/loader/resource_loader_unittest.cc

Issue 1888963004: Add HttpProtocolHandler and convert everything to use it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove-supports-scheme
Patch Set: even more rebase Created 4 years, 8 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) 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 30 matching lines...) Expand all
41 #include "net/base/net_errors.h" 41 #include "net/base/net_errors.h"
42 #include "net/base/request_priority.h" 42 #include "net/base/request_priority.h"
43 #include "net/base/test_data_directory.h" 43 #include "net/base/test_data_directory.h"
44 #include "net/base/upload_bytes_element_reader.h" 44 #include "net/base/upload_bytes_element_reader.h"
45 #include "net/cert/x509_certificate.h" 45 #include "net/cert/x509_certificate.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/url_request/http_protocol_handler.h"
51 #include "net/url_request/url_request.h" 52 #include "net/url_request/url_request.h"
52 #include "net/url_request/url_request_filter.h" 53 #include "net/url_request/url_request_filter.h"
53 #include "net/url_request/url_request_interceptor.h" 54 #include "net/url_request/url_request_interceptor.h"
54 #include "net/url_request/url_request_job_factory.h" 55 #include "net/url_request/url_request_job_factory.h"
55 #include "net/url_request/url_request_job_factory_impl.h" 56 #include "net/url_request/url_request_job_factory_impl.h"
56 #include "net/url_request/url_request_test_job.h" 57 #include "net/url_request/url_request_test_job.h"
57 #include "net/url_request/url_request_test_util.h" 58 #include "net/url_request/url_request_test_util.h"
58 #include "storage/browser/blob/shareable_file_reference.h" 59 #include "storage/browser/blob/shareable_file_reference.h"
59 #include "testing/gtest/include/gtest/gtest.h" 60 #include "testing/gtest/include/gtest/gtest.h"
60 61
(...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 new ResourceHandlerStub(request.get())); 583 new ResourceHandlerStub(request.get()));
583 raw_ptr_resource_handler_ = resource_handler.get(); 584 raw_ptr_resource_handler_ = resource_handler.get();
584 loader_.reset(new ResourceLoader( 585 loader_.reset(new ResourceLoader(
585 std::move(request), 586 std::move(request),
586 WrapResourceHandler(std::move(resource_handler), raw_ptr_to_request_), 587 WrapResourceHandler(std::move(resource_handler), raw_ptr_to_request_),
587 CertStore::GetInstance(), this)); 588 CertStore::GetInstance(), this));
588 } 589 }
589 590
590 void SetUp() override { 591 void SetUp() override {
591 job_factory_.SetProtocolHandler("test", CreateProtocolHandler()); 592 job_factory_.SetProtocolHandler("test", CreateProtocolHandler());
593 job_factory_.SetProtocolHandler(
594 "https", base::WrapUnique(new net::HttpProtocolHandler));
mmenke 2016/04/22 18:37:52 Could you just create the factory with the default
mgersh 2016/04/22 20:27:15 Done.
592 595
593 browser_context_.reset(new TestBrowserContext()); 596 browser_context_.reset(new TestBrowserContext());
594 scoped_refptr<SiteInstance> site_instance = 597 scoped_refptr<SiteInstance> site_instance =
595 SiteInstance::Create(browser_context_.get()); 598 SiteInstance::Create(browser_context_.get());
596 web_contents_.reset( 599 web_contents_.reset(
597 TestWebContents::Create(browser_context_.get(), site_instance.get())); 600 TestWebContents::Create(browser_context_.get(), site_instance.get()));
598 601
599 std::unique_ptr<net::URLRequest> request( 602 std::unique_ptr<net::URLRequest> request(
600 resource_context_.GetRequestContext()->CreateRequest( 603 resource_context_.GetRequestContext()->CreateRequest(
601 test_url(), net::DEFAULT_PRIORITY, nullptr /* delegate */)); 604 test_url(), net::DEFAULT_PRIORITY, nullptr /* delegate */));
(...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after
1146 ASSERT_TRUE( 1149 ASSERT_TRUE(
1147 CertStore::GetInstance()->RetrieveCert(deserialized.cert_id, &cert)); 1150 CertStore::GetInstance()->RetrieveCert(deserialized.cert_id, &cert));
1148 EXPECT_TRUE(cert->Equals(GetTestCert().get())); 1151 EXPECT_TRUE(cert->Equals(GetTestCert().get()));
1149 1152
1150 EXPECT_EQ(kTestCertError, deserialized.cert_status); 1153 EXPECT_EQ(kTestCertError, deserialized.cert_status);
1151 EXPECT_EQ(kTestConnectionStatus, deserialized.connection_status); 1154 EXPECT_EQ(kTestConnectionStatus, deserialized.connection_status);
1152 EXPECT_EQ(kTestSecurityBits, deserialized.security_bits); 1155 EXPECT_EQ(kTestSecurityBits, deserialized.security_bits);
1153 } 1156 }
1154 1157
1155 } // namespace content 1158 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698