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

Side by Side Diff: chrome/browser/io_thread.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) 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 "chrome/browser/io_thread.h" 5 #include "chrome/browser/io_thread.h"
6 6
7 #include <utility> 7 #include <utility>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/base64.h" 10 #include "base/base64.h"
(...skipping 1642 matching lines...) Expand 10 before | Expand all | Expand 10 after
1653 context->set_cert_verifier(globals->cert_verifier.get()); 1653 context->set_cert_verifier(globals->cert_verifier.get());
1654 context->set_transport_security_state( 1654 context->set_transport_security_state(
1655 globals->transport_security_state.get()); 1655 globals->transport_security_state.get());
1656 context->set_cert_transparency_verifier( 1656 context->set_cert_transparency_verifier(
1657 globals->cert_transparency_verifier.get()); 1657 globals->cert_transparency_verifier.get());
1658 context->set_ssl_config_service(globals->ssl_config_service.get()); 1658 context->set_ssl_config_service(globals->ssl_config_service.get());
1659 context->set_http_auth_handler_factory( 1659 context->set_http_auth_handler_factory(
1660 globals->http_auth_handler_factory.get()); 1660 globals->http_auth_handler_factory.get());
1661 context->set_proxy_service(globals->system_proxy_service.get()); 1661 context->set_proxy_service(globals->system_proxy_service.get());
1662 1662
1663 globals->system_url_request_job_factory.reset( 1663 globals->system_url_request_job_factory =
1664 new net::URLRequestJobFactoryImpl()); 1664 net::URLRequestJobFactoryImpl::CreateWithDefaultProtocolHandlers();
1665 context->set_job_factory(globals->system_url_request_job_factory.get()); 1665 context->set_job_factory(globals->system_url_request_job_factory.get());
1666 1666
1667 context->set_cookie_store(globals->system_cookie_store.get()); 1667 context->set_cookie_store(globals->system_cookie_store.get());
1668 context->set_channel_id_service( 1668 context->set_channel_id_service(
1669 globals->system_channel_id_service.get()); 1669 globals->system_channel_id_service.get());
1670 context->set_network_delegate(globals->system_network_delegate.get()); 1670 context->set_network_delegate(globals->system_network_delegate.get());
1671 context->set_http_user_agent_settings( 1671 context->set_http_user_agent_settings(
1672 globals->http_user_agent_settings.get()); 1672 globals->http_user_agent_settings.get());
1673 context->set_network_quality_estimator( 1673 context->set_network_quality_estimator(
1674 globals->network_quality_estimator.get()); 1674 globals->network_quality_estimator.get());
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
1741 // is fixed. 1741 // is fixed.
1742 tracked_objects::ScopedTracker tracking_profile3( 1742 tracked_objects::ScopedTracker tracking_profile3(
1743 FROM_HERE_WITH_EXPLICIT_FUNCTION( 1743 FROM_HERE_WITH_EXPLICIT_FUNCTION(
1744 "466432 IOThread::ConstructProxyScriptFetcherContext3")); 1744 "466432 IOThread::ConstructProxyScriptFetcherContext3"));
1745 globals->proxy_script_fetcher_http_transaction_factory.reset( 1745 globals->proxy_script_fetcher_http_transaction_factory.reset(
1746 new net::HttpNetworkLayer( 1746 new net::HttpNetworkLayer(
1747 globals->proxy_script_fetcher_http_network_session.get())); 1747 globals->proxy_script_fetcher_http_network_session.get()));
1748 context->set_http_transaction_factory( 1748 context->set_http_transaction_factory(
1749 globals->proxy_script_fetcher_http_transaction_factory.get()); 1749 globals->proxy_script_fetcher_http_transaction_factory.get());
1750 1750
1751 std::unique_ptr<net::URLRequestJobFactoryImpl> job_factory( 1751 std::unique_ptr<net::URLRequestJobFactoryImpl> job_factory =
1752 new net::URLRequestJobFactoryImpl()); 1752 net::URLRequestJobFactoryImpl::CreateWithDefaultProtocolHandlers();
1753 1753
1754 job_factory->SetProtocolHandler( 1754 job_factory->SetProtocolHandler(
1755 url::kDataScheme, base::WrapUnique(new net::DataProtocolHandler())); 1755 url::kDataScheme, base::WrapUnique(new net::DataProtocolHandler()));
1756 job_factory->SetProtocolHandler( 1756 job_factory->SetProtocolHandler(
1757 url::kFileScheme, 1757 url::kFileScheme,
1758 base::WrapUnique(new net::FileProtocolHandler( 1758 base::WrapUnique(new net::FileProtocolHandler(
1759 content::BrowserThread::GetBlockingPool() 1759 content::BrowserThread::GetBlockingPool()
1760 ->GetTaskRunnerWithShutdownBehavior( 1760 ->GetTaskRunnerWithShutdownBehavior(
1761 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)))); 1761 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN))));
1762 #if !defined(DISABLE_FTP_SUPPORT) 1762 #if !defined(DISABLE_FTP_SUPPORT)
(...skipping 13 matching lines...) Expand all
1776 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the 1776 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the
1777 // system URLRequestContext too. There's no reason this should be tied to a 1777 // system URLRequestContext too. There's no reason this should be tied to a
1778 // profile. 1778 // profile.
1779 return context; 1779 return context;
1780 } 1780 }
1781 1781
1782 const metrics::UpdateUsagePrefCallbackType& 1782 const metrics::UpdateUsagePrefCallbackType&
1783 IOThread::GetMetricsDataUseForwarder() { 1783 IOThread::GetMetricsDataUseForwarder() {
1784 return metrics_data_use_forwarder_; 1784 return metrics_data_use_forwarder_;
1785 } 1785 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698