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

Side by Side Diff: chrome/browser/safe_browsing/certificate_reporting_service.cc

Issue 2851493003: Remove unused CookiePreferences from report sender and never send cookies (Closed)
Patch Set: Fix rebase Created 3 years, 7 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #include "chrome/browser/safe_browsing/certificate_reporting_service.h" 4 #include "chrome/browser/safe_browsing/certificate_reporting_service.h"
5 5
6 #include "base/bind_helpers.h" 6 #include "base/bind_helpers.h"
7 #include "base/metrics/histogram_macros.h" 7 #include "base/metrics/histogram_macros.h"
8 #include "base/metrics/sparse_histogram.h" 8 #include "base/metrics/sparse_histogram.h"
9 #include "base/time/clock.h" 9 #include "base/time/clock.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 uint32_t server_public_key_version) { 298 uint32_t server_public_key_version) {
299 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 299 DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
300 // url_request_context_ is null during shutdown. 300 // url_request_context_ is null during shutdown.
301 if (!enabled || !url_request_context) { 301 if (!enabled || !url_request_context) {
302 reporter_.reset(); 302 reporter_.reset();
303 return; 303 return;
304 } 304 }
305 std::unique_ptr<certificate_reporting::ErrorReporter> error_reporter; 305 std::unique_ptr<certificate_reporting::ErrorReporter> error_reporter;
306 if (server_public_key) { 306 if (server_public_key) {
307 // Only used in tests. 307 // Only used in tests.
308 std::unique_ptr<net::ReportSender> report_sender(new net::ReportSender( 308 std::unique_ptr<net::ReportSender> report_sender(
309 url_request_context, net::ReportSender::DO_NOT_SEND_COOKIES)); 309 new net::ReportSender(url_request_context));
310 error_reporter.reset(new certificate_reporting::ErrorReporter( 310 error_reporter.reset(new certificate_reporting::ErrorReporter(
311 GURL(kExtendedReportingUploadUrl), server_public_key, 311 GURL(kExtendedReportingUploadUrl), server_public_key,
312 server_public_key_version, std::move(report_sender))); 312 server_public_key_version, std::move(report_sender)));
313 } else { 313 } else {
314 error_reporter.reset(new certificate_reporting::ErrorReporter( 314 error_reporter.reset(new certificate_reporting::ErrorReporter(
315 url_request_context, GURL(kExtendedReportingUploadUrl), 315 url_request_context, GURL(kExtendedReportingUploadUrl)));
316 net::ReportSender::DO_NOT_SEND_COOKIES));
317 } 316 }
318 reporter_.reset( 317 reporter_.reset(
319 new Reporter(std::move(error_reporter), 318 new Reporter(std::move(error_reporter),
320 std::unique_ptr<BoundedReportList>( 319 std::unique_ptr<BoundedReportList>(
321 new BoundedReportList(max_queued_report_count)), 320 new BoundedReportList(max_queued_report_count)),
322 clock, max_report_age, true /* retries_enabled */)); 321 clock, max_report_age, true /* retries_enabled */));
323 } 322 }
324 323
325 void CertificateReportingService::OnPreferenceChanged() { 324 void CertificateReportingService::OnPreferenceChanged() {
326 safe_browsing::SafeBrowsingService* safe_browsing_service_ = 325 safe_browsing::SafeBrowsingService* safe_browsing_service_ =
327 g_browser_process->safe_browsing_service(); 326 g_browser_process->safe_browsing_service();
328 const bool enabled = safe_browsing_service_ && 327 const bool enabled = safe_browsing_service_ &&
329 safe_browsing_service_->enabled_by_prefs() && 328 safe_browsing_service_->enabled_by_prefs() &&
330 safe_browsing::IsExtendedReportingEnabled(pref_service_); 329 safe_browsing::IsExtendedReportingEnabled(pref_service_);
331 SetEnabled(enabled); 330 SetEnabled(enabled);
332 } 331 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_io_data.cc ('k') | chrome/browser/safe_browsing/certificate_reporting_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698