| Index: chrome/browser/ssl/ssl_browser_tests.cc
|
| diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
|
| index 6d50c0b8c6ad91cf02664afd086581b5cd3e6d11..94fa61fe7c18466861149d2eb9e79dc04b021546 100644
|
| --- a/chrome/browser/ssl/ssl_browser_tests.cc
|
| +++ b/chrome/browser/ssl/ssl_browser_tests.cc
|
| @@ -31,7 +31,6 @@
|
| #include "chrome/browser/ssl/common_name_mismatch_handler.h"
|
| #include "chrome/browser/ssl/security_state_model.h"
|
| #include "chrome/browser/ssl/ssl_blocking_page.h"
|
| -#include "chrome/browser/ssl/ssl_error_classification.h"
|
| #include "chrome/browser/ssl/ssl_error_handler.h"
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/browser_commands.h"
|
| @@ -46,6 +45,7 @@
|
| #include "chrome/test/base/ui_test_utils.h"
|
| #include "components/content_settings/core/browser/host_content_settings_map.h"
|
| #include "components/security_interstitials/core/metrics_helper.h"
|
| +#include "components/ssl_errors/error_classification.h"
|
| #include "components/variations/variations_associated_data.h"
|
| #include "components/web_modal/web_contents_modal_dialog_manager.h"
|
| #include "content/public/browser/browser_context.h"
|
| @@ -509,8 +509,7 @@ class SSLUITest
|
| mock_clock->SetNow(base::Time::NowFromSystemTime());
|
| mock_clock->Advance(base::TimeDelta::FromDays(367));
|
| SSLErrorHandler::SetClockForTest(mock_clock.get());
|
| - SSLErrorClassification::SetBuildTimeForTesting(
|
| - base::Time::NowFromSystemTime());
|
| + ssl_errors::SetBuildTimeForTesting(base::Time::NowFromSystemTime());
|
|
|
| // Opt in to sending reports for invalid certificate chains.
|
| certificate_reporting_test_utils::SetCertReportingOptIn(browser, opt_in);
|
| @@ -864,8 +863,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSErrorCausedByClock) {
|
| mock_clock->SetNow(base::Time::NowFromSystemTime());
|
| mock_clock->Advance(base::TimeDelta::FromDays(367));
|
| SSLErrorHandler::SetClockForTest(mock_clock.get());
|
| - SSLErrorClassification::SetBuildTimeForTesting(
|
| - base::Time::NowFromSystemTime());
|
| + ssl_errors::SetBuildTimeForTesting(base::Time::NowFromSystemTime());
|
|
|
| ui_test_utils::NavigateToURL(browser(), https_server_expired_.GetURL("/"));
|
| WebContents* clock_tab = browser()->tab_strip_model()->GetActiveWebContents();
|
| @@ -2491,8 +2489,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest,
|
| mock_clock.SetNow(base::Time::NowFromSystemTime());
|
| mock_clock.Advance(base::TimeDelta::FromDays(367));
|
| SSLErrorHandler::SetClockForTest(&mock_clock);
|
| - SSLErrorClassification::SetBuildTimeForTesting(
|
| - base::Time::NowFromSystemTime());
|
| + ssl_errors::SetBuildTimeForTesting(base::Time::NowFromSystemTime());
|
|
|
| ui_test_utils::NavigateToURL(browser(), https_server_expired_.GetURL("/"));
|
| content::WaitForInterstitialAttach(tab);
|
|
|