Chromium Code Reviews| Index: chrome/browser/profiles/profile_io_data.cc |
| diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc |
| index 9f0443e609259742b0dec36e260296b827a264c4..4d08286130b1dd9fc1107709c229cbeedc536432 100644 |
| --- a/chrome/browser/profiles/profile_io_data.cc |
| +++ b/chrome/browser/profiles/profile_io_data.cc |
| @@ -35,6 +35,7 @@ |
| #include "chrome/browser/io_thread.h" |
| #include "chrome/browser/media/media_device_id_salt.h" |
| #include "chrome/browser/net/about_protocol_handler.h" |
| +#include "chrome/browser/net/certificate_error_reporter.h" |
| #include "chrome/browser/net/chrome_fraudulent_certificate_reporter.h" |
| #include "chrome/browser/net/chrome_http_user_agent_settings.h" |
| #include "chrome/browser/net/chrome_net_log.h" |
| @@ -84,6 +85,7 @@ |
| #include "net/url_request/url_request_intercepting_job_factory.h" |
| #include "net/url_request/url_request_interceptor.h" |
| #include "net/url_request/url_request_job_factory_impl.h" |
| +#include "url/gurl.h" |
| #if defined(ENABLE_CONFIGURATION_POLICY) |
| #include "chrome/browser/policy/cloud/policy_header_service_factory.h" |
| @@ -149,6 +151,7 @@ |
| #include "net/ssl/client_cert_store_mac.h" |
| #endif |
| +using chrome_browser_net::CertificateErrorReporter; |
| using content::BrowserContext; |
| using content::BrowserThread; |
| using content::ResourceContext; |
| @@ -885,10 +888,20 @@ bool ProfileIOData::GetMetricsEnabledStateOnIOThread() const { |
| #endif // defined(OS_CHROMEOS) |
| } |
| +void ProfileIOData::set_certificate_error_reporter_for_testing( |
| + chrome_browser_net::CertificateErrorReporter* certificate_error_reporter) { |
| + certificate_error_reporter_.reset(certificate_error_reporter); |
| +} |
| + |
| bool ProfileIOData::IsDataReductionProxyEnabled() const { |
| return data_reduction_proxy_io_data()->IsEnabled(); |
| } |
| +base::WeakPtr<CertificateErrorReporter> |
| +ProfileIOData::certificate_error_reporter() const { |
| + return certificate_error_reporter_->GetWeakPtr(); |
| +} |
| + |
| void ProfileIOData::set_data_reduction_proxy_io_data( |
| scoped_ptr<data_reduction_proxy::DataReductionProxyIOData> |
| data_reduction_proxy_io_data) const { |
| @@ -1060,6 +1073,9 @@ void ProfileIOData::Init( |
| fraudulent_certificate_reporter_.reset( |
| new chrome_browser_net::ChromeFraudulentCertificateReporter( |
| main_request_context_.get())); |
| + certificate_error_reporter_.reset(new CertificateErrorReporter( |
| + main_request_context_.get(), |
|
mattm
2015/03/17 20:58:12
If these are going to be handled by safebrowsing s
estark
2015/03/17 21:26:15
Could SafeBrowsingPingManager be the thing that ow
mattm
2015/03/17 23:57:51
I suppose, yeah.
Oh, I forgot to mention, with us
estark
2015/03/18 15:57:18
Done.
mattm
2015/03/23 05:31:17
Just need to remove the LOAD_DO_NOT_SEND_COOKIES a
felt
2015/03/23 14:04:32
Hold up real quick -- what are the implications of
estark
2015/03/23 20:55:28
Done.
I think I should add unit tests that Certif
|
| + GURL(chrome_browser_net::kExtendedReportingUploadUrl))); |
| // TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed. |
| tracked_objects::ScopedTracker tracking_profile3( |