| Index: chrome/browser/chrome_content_browser_client.cc
|
| diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
| index c01470d5715827bfb50a0b7e9ebaea960bff36d8..23f5819d06c1dfe114b2de13661fb809e1bfe3a2 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -41,6 +41,7 @@
|
| #include "chrome/browser/media/midi_permission_context_factory.h"
|
| #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h"
|
| #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h"
|
| +#include "chrome/browser/net/certificate_error_reporter.h"
|
| #include "chrome/browser/net/chrome_net_log.h"
|
| #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
|
| #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.h"
|
| @@ -137,6 +138,7 @@
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| #include "ui/resources/grit/ui_resources.h"
|
| +#include "url/gurl.h"
|
|
|
| #if defined(OS_WIN)
|
| #include "base/win/windows_version.h"
|
| @@ -698,6 +700,9 @@ ChromeContentBrowserClient::ChromeContentBrowserClient()
|
| v8_natives_fd_(-1),
|
| v8_snapshot_fd_(-1),
|
| #endif // OS_POSIX && !OS_MACOSX
|
| + certificate_error_reporter_(
|
| + new chrome_browser_net::CertificateErrorReporter(
|
| + GURL(chrome_browser_net::kExtendedReportingUploadUrl))),
|
| weak_factory_(this) {
|
| #if defined(ENABLE_PLUGINS)
|
| for (size_t i = 0; i < arraysize(kPredefinedAllowedDevChannelOrigins); ++i)
|
| @@ -1847,8 +1852,9 @@ void ChromeContentBrowserClient::AllowCertificateError(
|
| if (expired_previous_decision)
|
| options_mask |= SSLBlockingPage::EXPIRED_BUT_PREVIOUSLY_ALLOWED;
|
|
|
| - SSLErrorHandler::HandleSSLError(
|
| - tab, cert_error, ssl_info, request_url, options_mask, callback);
|
| + SSLErrorHandler::HandleSSLError(tab, cert_error, ssl_info, request_url,
|
| + options_mask, certificate_error_reporter_,
|
| + callback);
|
| }
|
|
|
| void ChromeContentBrowserClient::SelectClientCertificate(
|
|
|