Wrap SSL error handler configuration with a lazy instance

chrome/browser/captive_portal/captive_portal_browsertest.cc

Index: chrome/browser/captive_portal/captive_portal_browsertest.cc
diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc
index 209141e86dda9f53e8372b984a1fe9b7d871f4ff..4f504a2cbe1b058db89c80b6709d839be30e9982 100644
--- a/chrome/browser/captive_portal/captive_portal_browsertest.cc
+++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc
@@ -871,11 +871,11 @@ SSLInterstitialTimerObserver::SSLInterstitialTimerObserver(
       message_loop_runner_(new content::MessageLoopRunner) {
   callback_ = base::Bind(&SSLInterstitialTimerObserver::OnTimerStarted,
                          base::Unretained(this));
-  SSLErrorHandler::SetInterstitialTimerStartedCallbackForTest(&callback_);
+  SSLErrorHandler::SetInterstitialTimerStartedCallbackForTesting(&callback_);
 }
 
 SSLInterstitialTimerObserver::~SSLInterstitialTimerObserver() {
-  SSLErrorHandler::SetInterstitialTimerStartedCallbackForTest(nullptr);
+  SSLErrorHandler::SetInterstitialTimerStartedCallbackForTesting(nullptr);
 }
 
 void SSLInterstitialTimerObserver::WaitForTimerStarted() {
@@ -1125,7 +1125,8 @@ void CaptivePortalBrowserTest::SetUpOnMainThread() {
   // Set SSL interstitial delay long enough so that a captive portal result
   // is guaranteed to arrive during this window, and a captive portal
   // error page is displayed instead of an SSL interstitial.
-  SSLErrorHandler::SetInterstitialDelayForTest(base::TimeDelta::FromHours(1));
+  SSLErrorHandler::SetInterstitialDelayForTesting(
+      base::TimeDelta::FromHours(1));
 }
 
 void CaptivePortalBrowserTest::TearDownOnMainThread() {
@@ -2339,7 +2340,7 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, SSLCertErrorLogin) {
   // Set SSL interstitial delay to zero so that a captive portal result can not
   // arrive during this window, so an SSL interstitial is displayed instead
   // of a captive portal error page.
-  SSLErrorHandler::SetInterstitialDelayForTest(base::TimeDelta());
+  SSLErrorHandler::SetInterstitialDelayForTesting(base::TimeDelta());
   TabStripModel* tab_strip_model = browser()->tab_strip_model();
   WebContents* broken_tab_contents = tab_strip_model->GetActiveWebContents();