Introduce ThreadTaskRunnerHandle::OverrideForTesting and TestMockTimeTaskRunner::ScopedContext.

net/http/http_server_properties_manager.cc

Index: net/http/http_server_properties_manager.cc
diff --git a/net/http/http_server_properties_manager.cc b/net/http/http_server_properties_manager.cc
index 0f737ff0fcb51c749f539286022601e6800ada01..3bc7088153f6ba35f2661d4d04552810b16fe22b 100644
--- a/net/http/http_server_properties_manager.cc
+++ b/net/http/http_server_properties_manager.cc
@@ -26,12 +26,12 @@ namespace {
 // Time to wait before starting an update the http_server_properties_impl_ cache
 // from preferences. Scheduling another update during this period will be a
 // no-op.
-const int64_t kUpdateCacheDelayMs = 1000;
+constexpr base::TimeDelta kUpdateCacheDelay = base::TimeDelta::FromSeconds(1);
 
 // Time to wait before starting an update the preferences from the
 // http_server_properties_impl_ cache. Scheduling another update during this
 // period will be a no-op.
-const int64_t kUpdatePrefsDelayMs = 60000;
+constexpr base::TimeDelta kUpdatePrefsDelay = base::TimeDelta::FromSeconds(60);
 
 // "version" 0 indicates, http_server_properties doesn't have "version"
 // property.
@@ -366,6 +366,16 @@ bool HttpServerPropertiesManager::IsInitialized() const {
   return is_initialized_;
 }
 
+// static
+base::TimeDelta HttpServerPropertiesManager::GetUpdateCacheDelayForTesting() {
+  return kUpdateCacheDelay;

[Zhongyi Shi, 2017/02/15 22:04:42]

These methods are for unittests only right? I am not supportive to add tests
only methods in the production code. Could you try to remove this?

[gab, 2017/02/15 22:29:16]

I think it's cleaner to FastForwardBy the current amount than to always
FastForwardUntilNoTasksRemain() -- though I only did that where it was crucial
in this CL because I already spent to much time on these tests... There are
presubmits in place to ensure *For testing() methods are only called from
*test.cc files.

[Zhongyi Shi, 2017/02/16 19:35:25]

Acknowledged.

+}
+
+// static
+base::TimeDelta HttpServerPropertiesManager::GetUpdatePrefsDelayForTesting() {
+  return kUpdatePrefsDelay;
+}
+
 //
 // Update the HttpServerPropertiesImpl's cache with data from preferences.
 //
@@ -376,7 +386,7 @@ void HttpServerPropertiesManager::ScheduleUpdateCacheOnPrefThread() {
     return;
 
   pref_cache_update_timer_->Start(
-      FROM_HERE, base::TimeDelta::FromMilliseconds(kUpdateCacheDelayMs), this,
+      FROM_HERE, kUpdateCacheDelay, this,
       &HttpServerPropertiesManager::UpdateCacheFromPrefsOnPrefThread);
 }
 
@@ -792,7 +802,7 @@ void HttpServerPropertiesManager::ScheduleUpdatePrefsOnNetworkThread(
     return;
 
   network_prefs_update_timer_->Start(
-      FROM_HERE, base::TimeDelta::FromMilliseconds(kUpdatePrefsDelayMs), this,
+      FROM_HERE, kUpdatePrefsDelay, this,
       &HttpServerPropertiesManager::UpdatePrefsFromCacheOnNetworkThread);
 
   // TODO(rtenneti): Delete the following histogram after collecting some data.