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

Side by Side Diff: chrome/browser/profiles/profile_io_data.cc

Issue 2650803004: Wire NetLog into the TreeStateTracker (Closed)
Patch Set: Looking for entry first Created 3 years, 10 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
« no previous file with comments | « chrome/browser/io_thread.cc ('k') | components/certificate_transparency/BUILD.gn » ('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/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
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 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
1321 void ProfileIOData::SetCookieSettingsForTesting( 1321 void ProfileIOData::SetCookieSettingsForTesting(
1322 content_settings::CookieSettings* cookie_settings) { 1322 content_settings::CookieSettings* cookie_settings) {
1323 DCHECK(!cookie_settings_.get()); 1323 DCHECK(!cookie_settings_.get());
1324 cookie_settings_ = cookie_settings; 1324 cookie_settings_ = cookie_settings;
1325 } 1325 }
1326 1326
1327 policy::URLBlacklist::URLBlacklistState ProfileIOData::GetURLBlacklistState( 1327 policy::URLBlacklist::URLBlacklistState ProfileIOData::GetURLBlacklistState(
1328 const GURL& url) const { 1328 const GURL& url) const {
1329 return url_blacklist_manager_->GetURLBlacklistState(url); 1329 return url_blacklist_manager_->GetURLBlacklistState(url);
1330 } 1330 }
OLDNEW
« no previous file with comments | « chrome/browser/io_thread.cc ('k') | components/certificate_transparency/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698