Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(87)

Unified Diff: chrome/browser/ssl/ssl_error_handler.h

Issue 2610183004: Wrap SSL error handler configuration with a lazy instance (Closed)
Patch Set: Add ForTesting to config setter methods Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ssl/ssl_browser_tests.cc ('k') | chrome/browser/ssl/ssl_error_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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:
« no previous file with comments | « chrome/browser/ssl/ssl_browser_tests.cc ('k') | chrome/browser/ssl/ssl_error_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698