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

Side by Side Diff: chrome/browser/io_thread.cc

Issue 2414883005: TEMP DO NOT LAND (Closed)
Patch Set: tmp Created 4 years, 1 month 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
« no previous file with comments | « no previous file | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 876 matching lines...) Expand 10 before | Expand all | Expand 10 after
887 context->set_enable_brotli(globals->enable_brotli); 887 context->set_enable_brotli(globals->enable_brotli);
888 888
889 net::HttpNetworkSession::Params system_params(params); 889 net::HttpNetworkSession::Params system_params(params);
890 net::URLRequestContextBuilder::SetHttpNetworkSessionComponents( 890 net::URLRequestContextBuilder::SetHttpNetworkSessionComponents(
891 context, &system_params); 891 context, &system_params);
892 892
893 globals->system_http_network_session.reset( 893 globals->system_http_network_session.reset(
894 new net::HttpNetworkSession(system_params)); 894 new net::HttpNetworkSession(system_params));
895 globals->system_http_transaction_factory.reset( 895 globals->system_http_transaction_factory.reset(
896 new net::HttpNetworkLayer(globals->system_http_network_session.get())); 896 new net::HttpNetworkLayer(globals->system_http_network_session.get()));
897 context->set_name_string("systems");
897 context->set_http_transaction_factory( 898 context->set_http_transaction_factory(
898 globals->system_http_transaction_factory.get()); 899 globals->system_http_transaction_factory.get());
899 900
900 return context; 901 return context;
901 } 902 }
902 903
903 // static 904 // static
904 void IOThread::ConfigureParamsFromFieldTrialsAndCommandLine( 905 void IOThread::ConfigureParamsFromFieldTrialsAndCommandLine(
905 const base::CommandLine& command_line, 906 const base::CommandLine& command_line,
906 bool is_quic_allowed_by_policy, 907 bool is_quic_allowed_by_policy,
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
1040 1041
1041 net::HttpNetworkSession::Params session_params(params); 1042 net::HttpNetworkSession::Params session_params(params);
1042 net::URLRequestContextBuilder::SetHttpNetworkSessionComponents( 1043 net::URLRequestContextBuilder::SetHttpNetworkSessionComponents(
1043 context, &session_params); 1044 context, &session_params);
1044 1045
1045 globals->proxy_script_fetcher_http_network_session.reset( 1046 globals->proxy_script_fetcher_http_network_session.reset(
1046 new net::HttpNetworkSession(session_params)); 1047 new net::HttpNetworkSession(session_params));
1047 globals->proxy_script_fetcher_http_transaction_factory.reset( 1048 globals->proxy_script_fetcher_http_transaction_factory.reset(
1048 new net::HttpNetworkLayer( 1049 new net::HttpNetworkLayer(
1049 globals->proxy_script_fetcher_http_network_session.get())); 1050 globals->proxy_script_fetcher_http_network_session.get()));
1051 context->set_name_string("proxy");
1050 context->set_http_transaction_factory( 1052 context->set_http_transaction_factory(
1051 globals->proxy_script_fetcher_http_transaction_factory.get()); 1053 globals->proxy_script_fetcher_http_transaction_factory.get());
1052 1054
1053 std::unique_ptr<net::URLRequestJobFactoryImpl> job_factory( 1055 std::unique_ptr<net::URLRequestJobFactoryImpl> job_factory(
1054 new net::URLRequestJobFactoryImpl()); 1056 new net::URLRequestJobFactoryImpl());
1055 1057
1056 job_factory->SetProtocolHandler(url::kDataScheme, 1058 job_factory->SetProtocolHandler(url::kDataScheme,
1057 base::MakeUnique<net::DataProtocolHandler>()); 1059 base::MakeUnique<net::DataProtocolHandler>());
1058 job_factory->SetProtocolHandler( 1060 job_factory->SetProtocolHandler(
1059 url::kFileScheme, 1061 url::kFileScheme,
(...skipping 15 matching lines...) Expand all
1075 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the 1077 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the
1076 // system URLRequestContext too. There's no reason this should be tied to a 1078 // system URLRequestContext too. There's no reason this should be tied to a
1077 // profile. 1079 // profile.
1078 return context; 1080 return context;
1079 } 1081 }
1080 1082
1081 const metrics::UpdateUsagePrefCallbackType& 1083 const metrics::UpdateUsagePrefCallbackType&
1082 IOThread::GetMetricsDataUseForwarder() { 1084 IOThread::GetMetricsDataUseForwarder() {
1083 return metrics_data_use_forwarder_; 1085 return metrics_data_use_forwarder_;
1084 } 1086 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698