| Index: chrome/browser/ssl/ssl_error_handler.h
|
| diff --git a/chrome/browser/ssl/ssl_error_handler.h b/chrome/browser/ssl/ssl_error_handler.h
|
| index 77b4aafe3d8d6d256a60b25a9493ab83b310e465..44213c1c130e3f78545c18f19b18f04f75d430ff 100644
|
| --- a/chrome/browser/ssl/ssl_error_handler.h
|
| +++ b/chrome/browser/ssl/ssl_error_handler.h
|
| @@ -29,6 +29,7 @@ class Profile;
|
|
|
| namespace base {
|
| class Clock;
|
| +class TimeDelta;
|
| }
|
|
|
| namespace content {
|
| @@ -41,11 +42,11 @@ class NetworkTimeTracker;
|
|
|
| // This class is responsible for deciding what type of interstitial to show for
|
| // an SSL validation error. The display of the interstitial might be delayed by
|
| -// a few seconds (2 by default) while trying to determine the cause of the
|
| -// error. During this window, the class will: check for a clock error, wait for
|
| -// a name-mismatch suggested URL, or wait for a captive portal result to arrive.
|
| -// If there is a name mismatch error and a corresponding suggested URL
|
| -// result arrives in this window, the user is redirected to the suggested URL.
|
| +// a few seconds while trying to determine the cause of the error. During this
|
| +// window, the class will: check for a clock error, wait for a name-mismatch
|
| +// suggested URL, or wait for a captive portal result to arrive. If there is a
|
| +// name mismatch error and a corresponding suggested URL result arrives in this
|
| +// window, the user is redirected to the suggested URL.
|
| // Failing that, if a captive portal detected result arrives in the time window,
|
| // a captive portal error page is shown. If none of these potential error
|
| // causes match, an SSL interstitial is shown.
|
| @@ -72,12 +73,12 @@ class SSLErrorHandler : public content::WebContentsUserData<SSLErrorHandler>,
|
| callback);
|
|
|
| // Testing methods.
|
| - static void SetInterstitialDelayForTest(base::TimeDelta delay);
|
| + static void SetInterstitialDelayForTesting(const base::TimeDelta& delay);
|
| // The callback pointer must remain valid for the duration of error handling.
|
| - static void SetInterstitialTimerStartedCallbackForTest(
|
| + static void SetInterstitialTimerStartedCallbackForTesting(
|
| TimerStartedCallback* callback);
|
| - static void SetClockForTest(base::Clock* testing_clock);
|
| - static void SetNetworkTimeTrackerForTest(
|
| + static void SetClockForTesting(base::Clock* testing_clock);
|
| + static void SetNetworkTimeTrackerForTesting(
|
| network_time::NetworkTimeTracker* tracker);
|
|
|
| protected:
|
|
|