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 1067 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1148 io_thread_globals->cert_verifier.get()); | 1149 io_thread_globals->cert_verifier.get()); |
1149 #endif | 1150 #endif |
1150 } | 1151 } |
1151 | 1152 |
1152 // Install the New Tab Page Interceptor. | 1153 // Install the New Tab Page Interceptor. |
1153 if (profile_params_->new_tab_page_interceptor.get()) { | 1154 if (profile_params_->new_tab_page_interceptor.get()) { |
1154 request_interceptors.push_back( | 1155 request_interceptors.push_back( |
1155 profile_params_->new_tab_page_interceptor.release()); | 1156 profile_params_->new_tab_page_interceptor.release()); |
1156 } | 1157 } |
1157 | 1158 |
1159 net::MultiLogCTVerifier* ct_verifier = new net::MultiLogCTVerifier(); | |
mmenke
2015/11/17 17:38:32
scoped_refptr? Think that makes the ownership mod
Eran Messeri
2015/11/18 14:16:22
Done.
| |
1160 ct_verifier->AddLogs(io_thread_globals->ct_logs); | |
1161 main_request_context_->set_cert_transparency_verifier(ct_verifier); | |
1162 cert_transparency_verifier_.reset(ct_verifier); | |
1163 | |
1158 InitializeInternal( | 1164 InitializeInternal( |
1159 network_delegate.Pass(), profile_params_.get(), | 1165 network_delegate.Pass(), profile_params_.get(), |
1160 protocol_handlers, request_interceptors.Pass()); | 1166 protocol_handlers, request_interceptors.Pass()); |
1161 | 1167 |
1162 profile_params_.reset(); | 1168 profile_params_.reset(); |
1163 initialized_ = true; | 1169 initialized_ = true; |
1164 } | 1170 } |
1165 | 1171 |
1166 void ProfileIOData::ApplyProfileParamsToContext( | 1172 void ProfileIOData::ApplyProfileParamsToContext( |
1167 net::URLRequestContext* context) const { | 1173 net::URLRequestContext* context) const { |
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1345 make_scoped_ptr(new DevToolsNetworkTransactionFactory( | 1351 make_scoped_ptr(new DevToolsNetworkTransactionFactory( |
1346 network_controller_handle_.GetController(), shared_session)), | 1352 network_controller_handle_.GetController(), shared_session)), |
1347 backend.Pass(), true /* set_up_quic_server_info */)); | 1353 backend.Pass(), true /* set_up_quic_server_info */)); |
1348 } | 1354 } |
1349 | 1355 |
1350 void ProfileIOData::SetCookieSettingsForTesting( | 1356 void ProfileIOData::SetCookieSettingsForTesting( |
1351 content_settings::CookieSettings* cookie_settings) { | 1357 content_settings::CookieSettings* cookie_settings) { |
1352 DCHECK(!cookie_settings_.get()); | 1358 DCHECK(!cookie_settings_.get()); |
1353 cookie_settings_ = cookie_settings; | 1359 cookie_settings_ = cookie_settings; |
1354 } | 1360 } |
OLD | NEW |