OLD | NEW |
---|---|
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/profiles/profile_io_data.h" | 5 #include "chrome/browser/profiles/profile_io_data.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
61 #include "components/signin/core/common/signin_pref_names.h" | 61 #include "components/signin/core/common/signin_pref_names.h" |
62 #include "components/sync_driver/pref_names.h" | 62 #include "components/sync_driver/pref_names.h" |
63 #include "components/url_formatter/url_fixer.h" | 63 #include "components/url_formatter/url_fixer.h" |
64 #include "content/public/browser/browser_thread.h" | 64 #include "content/public/browser/browser_thread.h" |
65 #include "content/public/browser/host_zoom_map.h" | 65 #include "content/public/browser/host_zoom_map.h" |
66 #include "content/public/browser/notification_service.h" | 66 #include "content/public/browser/notification_service.h" |
67 #include "content/public/browser/resource_context.h" | 67 #include "content/public/browser/resource_context.h" |
68 #include "net/base/keygen_handler.h" | 68 #include "net/base/keygen_handler.h" |
69 #include "net/base/network_quality_estimator.h" | 69 #include "net/base/network_quality_estimator.h" |
70 #include "net/cert/cert_verifier.h" | 70 #include "net/cert/cert_verifier.h" |
71 #include "net/cert/multi_log_ct_verifier.h" | |
71 #include "net/cookies/canonical_cookie.h" | 72 #include "net/cookies/canonical_cookie.h" |
72 #include "net/http/http_network_session.h" | 73 #include "net/http/http_network_session.h" |
73 #include "net/http/http_transaction_factory.h" | 74 #include "net/http/http_transaction_factory.h" |
74 #include "net/http/http_util.h" | 75 #include "net/http/http_util.h" |
75 #include "net/http/transport_security_persister.h" | 76 #include "net/http/transport_security_persister.h" |
76 #include "net/proxy/proxy_config_service_fixed.h" | 77 #include "net/proxy/proxy_config_service_fixed.h" |
77 #include "net/proxy/proxy_script_fetcher_impl.h" | 78 #include "net/proxy/proxy_script_fetcher_impl.h" |
78 #include "net/proxy/proxy_service.h" | 79 #include "net/proxy/proxy_service.h" |
79 #include "net/ssl/channel_id_service.h" | 80 #include "net/ssl/channel_id_service.h" |
80 #include "net/ssl/client_cert_store.h" | 81 #include "net/ssl/client_cert_store.h" |
(...skipping 1050 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1131 io_thread_globals->cert_verifier.get()); | 1132 io_thread_globals->cert_verifier.get()); |
1132 #endif | 1133 #endif |
1133 } | 1134 } |
1134 | 1135 |
1135 // Install the New Tab Page Interceptor. | 1136 // Install the New Tab Page Interceptor. |
1136 if (profile_params_->new_tab_page_interceptor.get()) { | 1137 if (profile_params_->new_tab_page_interceptor.get()) { |
1137 request_interceptors.push_back( | 1138 request_interceptors.push_back( |
1138 profile_params_->new_tab_page_interceptor.release()); | 1139 profile_params_->new_tab_page_interceptor.release()); |
1139 } | 1140 } |
1140 | 1141 |
1142 scoped_ptr<net::MultiLogCTVerifier> ct_verifier( | |
1143 new net::MultiLogCTVerifier()); | |
1144 ct_verifier->AddLogs(io_thread_globals->ct_logs); | |
1145 main_request_context_->set_cert_transparency_verifier(ct_verifier.get()); | |
1146 cert_transparency_verifier_.reset(ct_verifier.release()); | |
mmenke
2015/11/20 17:23:58
cert_transparency_verifier_ = ct_verifier.Pass()?
Eran Messeri
2015/11/23 12:34:38
Done.
| |
1147 | |
1141 InitializeInternal( | 1148 InitializeInternal( |
1142 network_delegate.Pass(), profile_params_.get(), | 1149 network_delegate.Pass(), profile_params_.get(), |
1143 protocol_handlers, request_interceptors.Pass()); | 1150 protocol_handlers, request_interceptors.Pass()); |
1144 | 1151 |
1145 profile_params_.reset(); | 1152 profile_params_.reset(); |
1146 initialized_ = true; | 1153 initialized_ = true; |
1147 } | 1154 } |
1148 | 1155 |
1149 void ProfileIOData::ApplyProfileParamsToContext( | 1156 void ProfileIOData::ApplyProfileParamsToContext( |
1150 net::URLRequestContext* context) const { | 1157 net::URLRequestContext* context) const { |
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1326 make_scoped_ptr(new DevToolsNetworkTransactionFactory( | 1333 make_scoped_ptr(new DevToolsNetworkTransactionFactory( |
1327 network_controller_handle_.GetController(), shared_session)), | 1334 network_controller_handle_.GetController(), shared_session)), |
1328 backend.Pass(), true /* set_up_quic_server_info */)); | 1335 backend.Pass(), true /* set_up_quic_server_info */)); |
1329 } | 1336 } |
1330 | 1337 |
1331 void ProfileIOData::SetCookieSettingsForTesting( | 1338 void ProfileIOData::SetCookieSettingsForTesting( |
1332 content_settings::CookieSettings* cookie_settings) { | 1339 content_settings::CookieSettings* cookie_settings) { |
1333 DCHECK(!cookie_settings_.get()); | 1340 DCHECK(!cookie_settings_.get()); |
1334 cookie_settings_ = cookie_settings; | 1341 cookie_settings_ = cookie_settings; |
1335 } | 1342 } |
OLD | NEW |