| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 1103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1114 request_interceptors.push_back( | 1114 request_interceptors.push_back( |
| 1115 std::move(profile_params_->new_tab_page_interceptor)); | 1115 std::move(profile_params_->new_tab_page_interceptor)); |
| 1116 } | 1116 } |
| 1117 | 1117 |
| 1118 std::unique_ptr<net::MultiLogCTVerifier> ct_verifier( | 1118 std::unique_ptr<net::MultiLogCTVerifier> ct_verifier( |
| 1119 new net::MultiLogCTVerifier()); | 1119 new net::MultiLogCTVerifier()); |
| 1120 ct_verifier->AddLogs(io_thread_globals->ct_logs); | 1120 ct_verifier->AddLogs(io_thread_globals->ct_logs); |
| 1121 main_request_context_->set_cert_transparency_verifier(ct_verifier.get()); | 1121 main_request_context_->set_cert_transparency_verifier(ct_verifier.get()); |
| 1122 | 1122 |
| 1123 ct_tree_tracker_.reset(new certificate_transparency::TreeStateTracker( | 1123 ct_tree_tracker_.reset(new certificate_transparency::TreeStateTracker( |
| 1124 io_thread_globals->ct_logs)); | 1124 io_thread_globals->ct_logs, io_thread->net_log())); |
| 1125 ct_verifier->SetObserver(ct_tree_tracker_.get()); | 1125 ct_verifier->SetObserver(ct_tree_tracker_.get()); |
| 1126 | 1126 |
| 1127 cert_transparency_verifier_ = std::move(ct_verifier); | 1127 cert_transparency_verifier_ = std::move(ct_verifier); |
| 1128 io_thread->RegisterSTHObserver(ct_tree_tracker_.get()); | 1128 io_thread->RegisterSTHObserver(ct_tree_tracker_.get()); |
| 1129 ct_tree_tracker_unregistration_ = | 1129 ct_tree_tracker_unregistration_ = |
| 1130 base::Bind(&IOThread::UnregisterSTHObserver, base::Unretained(io_thread), | 1130 base::Bind(&IOThread::UnregisterSTHObserver, base::Unretained(io_thread), |
| 1131 ct_tree_tracker_.get()); | 1131 ct_tree_tracker_.get()); |
| 1132 | 1132 |
| 1133 InitializeInternal(std::move(network_delegate), profile_params_.get(), | 1133 InitializeInternal(std::move(network_delegate), profile_params_.get(), |
| 1134 protocol_handlers, std::move(request_interceptors)); | 1134 protocol_handlers, std::move(request_interceptors)); |
| (...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1319 void ProfileIOData::SetCookieSettingsForTesting( | 1319 void ProfileIOData::SetCookieSettingsForTesting( |
| 1320 content_settings::CookieSettings* cookie_settings) { | 1320 content_settings::CookieSettings* cookie_settings) { |
| 1321 DCHECK(!cookie_settings_.get()); | 1321 DCHECK(!cookie_settings_.get()); |
| 1322 cookie_settings_ = cookie_settings; | 1322 cookie_settings_ = cookie_settings; |
| 1323 } | 1323 } |
| 1324 | 1324 |
| 1325 policy::URLBlacklist::URLBlacklistState ProfileIOData::GetURLBlacklistState( | 1325 policy::URLBlacklist::URLBlacklistState ProfileIOData::GetURLBlacklistState( |
| 1326 const GURL& url) const { | 1326 const GURL& url) const { |
| 1327 return url_blacklist_manager_->GetURLBlacklistState(url); | 1327 return url_blacklist_manager_->GetURLBlacklistState(url); |
| 1328 } | 1328 } |
| OLD | NEW |