Convert time constants to base::TimeDelta in chrome/browser/extensions.

Change-Id: I89c98bdec12e657b7928b00082a5c6591596879e
Reviewed-on: https://chromium-review.googlesource.com/1168595
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#581912}

chrome/browser/extensions/activity_log/counting_policy.cc

@@ -56,7 +56,7 @@ using extensions::Action;
 
 // Delay between cleaning passes (to delete old action records) through the
 // database.
-const int kCleaningDelayInHours = 12;
+constexpr base::TimeDelta kCleaningDelay = base::TimeDelta::FromHours(12);
 
 // We should log the arguments to these API calls.  Be careful when
 // constructing this whitelist to not keep arguments that might compromise
@@ -244,8 +244,7 @@ bool CountingPolicy::FlushDatabase(sql::Database* db) {
   // always check on the first database flush (since there might be a large
   // amount of data to clear).
   bool clean_database = (last_database_cleaning_time_.is_null() ||
-                         Now() - last_database_cleaning_time_ >
-                             base::TimeDelta::FromHours(kCleaningDelayInHours));
+                         Now() - last_database_cleaning_time_ > kCleaningDelay);
 
   if (queue.empty() && !clean_database)
     return true;

chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.cc

@@ -27,12 +27,17 @@ namespace api {
 namespace braille_display_private {
 
 namespace {
+
 // Delay between detecting a directory update and trying to connect
 // to the brlapi.
-const int64_t kConnectionDelayMs = 500;
+constexpr base::TimeDelta kConnectionDelay =
+    base::TimeDelta::FromMilliseconds(500);
+
 // How long to periodically retry connecting after a brltty restart.
 // Some displays are slow to connect.
-const int64_t kConnectRetryTimeout = 20000;
+constexpr base::TimeDelta kConnectRetryTimeout =
+    base::TimeDelta::FromSeconds(20);
+
 }  // namespace
 
 BrailleController::BrailleController() {
@@ -248,19 +253,16 @@ void BrailleControllerImpl::TryToConnect() {
 
 void BrailleControllerImpl::ResetRetryConnectHorizon() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  retry_connect_horizon_ =
-      base::Time::Now() +
-      base::TimeDelta::FromMilliseconds(kConnectRetryTimeout);
+  retry_connect_horizon_ = base::Time::Now() + kConnectRetryTimeout;
 }
 
 void BrailleControllerImpl::ScheduleTryToConnect() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  base::TimeDelta delay(base::TimeDelta::FromMilliseconds(kConnectionDelayMs));
   // Don't reschedule if there's already a connect scheduled or
   // the next attempt would fall outside of the retry limit.
   if (connect_scheduled_)
     return;
-  if (base::Time::Now() + delay > retry_connect_horizon_) {
+  if (base::Time::Now() + kConnectionDelay > retry_connect_horizon_) {
     VLOG(1) << "Stopping to retry to connect to brlapi";
     return;
   }
@@ -270,7 +272,7 @@ void BrailleControllerImpl::ScheduleTryToConnect() {
       BrowserThread::IO, FROM_HERE,
       base::BindOnce(&BrailleControllerImpl::TryToConnect,
                      base::Unretained(this)),
-      delay);
+      kConnectionDelay);
 }
 
 void BrailleControllerImpl::Disconnect() {

chrome/browser/extensions/api/tab_capture/offscreen_tab.cc

@@ -34,8 +34,8 @@ const int kMaxOffscreenTabsPerExtension = 4;
 
 // Time intervals used by the logic that detects when the capture of an
 // offscreen tab has stopped, to automatically tear it down and free resources.
-const int kMaxSecondsToWaitForCapture = 60;
-const int kPollIntervalInSeconds = 1;
+constexpr base::TimeDelta kMaxWaitForCapture = base::TimeDelta::FromMinutes(1);
+constexpr base::TimeDelta kPollInterval = base::TimeDelta::FromSeconds(1);
 
 }  // namespace
 
@@ -392,8 +392,7 @@ void OffscreenTab::DieIfContentCaptureEnded() {
     DVLOG(2) << "Capture of OffscreenTab content has started for start_url="
              << start_url_.spec();
     content_capture_was_detected_ = true;
-  } else if (base::TimeTicks::Now() - start_time_ >
-                 base::TimeDelta::FromSeconds(kMaxSecondsToWaitForCapture)) {
+  } else if (base::TimeTicks::Now() - start_time_ > kMaxWaitForCapture) {
     // More than a minute has elapsed since this OffscreenTab was started and
     // content capture still hasn't started.  As a safety precaution, assume
     // that content capture is never going to start and die to free up
@@ -405,9 +404,7 @@ void OffscreenTab::DieIfContentCaptureEnded() {
   }
 
   // Schedule the timer to check again in a second.
-  capture_poll_timer_.Start(
-      FROM_HERE,
-      base::TimeDelta::FromSeconds(kPollIntervalInSeconds),
+  capture_poll_timer_.Start(FROM_HERE, kPollInterval,
                             base::Bind(&OffscreenTab::DieIfContentCaptureEnded,
                                        base::Unretained(this)));
 }

chrome/browser/extensions/extension_garbage_collector.cc

@@ -42,12 +42,14 @@ namespace extensions {
 
 namespace {
 
-// Wait this many seconds before trying to garbage collect extensions again.
-const int kGarbageCollectRetryDelayInSeconds = 30;
+// Wait this long before trying to garbage collect extensions again.
+constexpr base::TimeDelta kGarbageCollectRetryDelay =
+    base::TimeDelta::FromSeconds(30);
 
-// Wait this many seconds after startup to see if there are any extensions
-// which can be garbage collected.
-const int kGarbageCollectStartupDelay = 30;
+// Wait this long after startup to see if there are any extensions which can be
+// garbage collected.
+constexpr base::TimeDelta kGarbageCollectStartupDelay =
+    base::TimeDelta::FromSeconds(30);
 
 typedef std::multimap<std::string, base::FilePath> ExtensionPathsMultimap;
 
@@ -117,7 +119,7 @@ ExtensionGarbageCollector::ExtensionGarbageCollector(
       FROM_HERE,
       base::Bind(&ExtensionGarbageCollector::GarbageCollectExtensions,
                  weak_factory_.GetWeakPtr()),
-      base::TimeDelta::FromSeconds(kGarbageCollectStartupDelay));
+      kGarbageCollectStartupDelay);
 
   extension_system->ready().Post(
       FROM_HERE,
@@ -182,7 +184,7 @@ void ExtensionGarbageCollector::GarbageCollectExtensions() {
         FROM_HERE,
         base::BindOnce(&ExtensionGarbageCollector::GarbageCollectExtensions,
                        weak_factory_.GetWeakPtr()),
-        base::TimeDelta::FromSeconds(kGarbageCollectRetryDelayInSeconds));
+        kGarbageCollectRetryDelay);
     return;
   }
 

chrome/browser/extensions/extension_service.cc

@@ -122,12 +122,12 @@ using LoadErrorBehavior = ExtensionRegistrar::LoadErrorBehavior;
 
 namespace {
 
-// Wait this many seconds after an extensions becomes idle before updating it.
-const int kUpdateIdleDelay = 5;
+// Wait this long after an extensions becomes idle before updating it.
+constexpr base::TimeDelta kUpdateIdleDelay = base::TimeDelta::FromSeconds(5);
 
 // IDs of extensions that have been replaced by component extensions and need to
 // be uninstalled.
-const char* kMigratedExtensionIds[] = {
+const char* const kMigratedExtensionIds[] = {
     "boadgeojelhgndaghljhdicfkmllpafd",  // Google Cast
     "dliochdbjfkdbacpmhlcpmleaejidimm"   // Google Cast (Beta)
 };
@@ -1812,7 +1812,7 @@ void ExtensionService::Observe(int type,
                     base::IgnoreResult(
                         &ExtensionService::FinishDelayedInstallationIfReady),
                     AsWeakPtr(), *it, false /*install_immediately*/),
-                base::TimeDelta::FromSeconds(kUpdateIdleDelay));
+                kUpdateIdleDelay);
           }
         }
       }

chrome/browser/extensions/updater/extension_cache_delegate.cc

@@ -5,32 +5,26 @@
 #include "chrome/browser/extensions/updater/extension_cache_delegate.h"
 
 namespace extensions {
-namespace {
-
-// Default maximum size of local cache on disk, in bytes.
-const size_t kDefaultCacheSizeLimit = 256 * 1024 * 1024;
-
-// Default minimum size of local cache on disk, in bytes.
-const int kDefaultMinimumCacheSize = 1024 * 1024;
-
-// Maximum age of unused extensions in the cache.
-const int kMaxCacheAgeInDays = 30;
-
-}  // namespace
 
 ExtensionCacheDelegate::~ExtensionCacheDelegate() {
 }
 
 size_t ExtensionCacheDelegate::GetMinimumCacheSize() const {
+  // Default minimum size of local cache on disk, in bytes.
+  static constexpr int kDefaultMinimumCacheSize = 1024 * 1024;
   return kDefaultMinimumCacheSize;
 }
 
 size_t ExtensionCacheDelegate::GetMaximumCacheSize() const {
+  // Default maximum size of local cache on disk, in bytes.
+  static constexpr size_t kDefaultCacheSizeLimit = 256 * 1024 * 1024;
   return kDefaultCacheSizeLimit;
 }
 
 base::TimeDelta ExtensionCacheDelegate::GetMaximumCacheAge() const {
-  return base::TimeDelta::FromDays(kMaxCacheAgeInDays);
+  // Maximum age of unused extensions in the cache.
+  static constexpr base::TimeDelta kMaxCacheAge = base::TimeDelta::FromDays(30);
+  return kMaxCacheAge;
 }
 
 }  // namespace extensions

chrome/browser/extensions/updater/local_extension_cache.cc

@@ -23,7 +23,8 @@ const char kCRXFileExtension[] = ".crx";
 
 // Delay between checks for flag file presence when waiting for the cache to
 // become ready.
-const int64_t kCacheStatusPollingDelayMs = 1000;
+constexpr base::TimeDelta kCacheStatusPollingDelay =
+    base::TimeDelta::FromSeconds(1);
 
 }  // namespace
 
@@ -39,8 +40,7 @@ LocalExtensionCache::LocalExtensionCache(
       min_cache_age_(base::Time::Now() - max_cache_age),
       backend_task_runner_(backend_task_runner),
       state_(kUninitialized),
-      cache_status_polling_delay_(
-          base::TimeDelta::FromMilliseconds(kCacheStatusPollingDelayMs)),
+      cache_status_polling_delay_(kCacheStatusPollingDelay),
       weak_ptr_factory_(this) {}
 
 LocalExtensionCache::~LocalExtensionCache() {

chrome/browser/extensions/webstore_installer.cc

@@ -102,7 +102,8 @@ const char kAppLauncherInstallSource[] = "applauncher";
 // See http://crbug.com/371398.
 const char kAuthUserQueryKey[] = "authuser";
 
-const size_t kTimeRemainingMinutesThreshold = 1u;
+constexpr base::TimeDelta kTimeRemainingThreshold =
+    base::TimeDelta::FromSeconds(1);
 
 // Folder for downloading crx files from the webstore. This is used so that the
 // crx files don't go via the usual downloads folder.
@@ -738,12 +739,8 @@ void WebstoreInstaller::UpdateDownloadProgress() {
   // timer.
   base::TimeDelta time_remaining;
   if (download_item_->TimeRemaining(&time_remaining) &&
-      time_remaining >
-          base::TimeDelta::FromSeconds(kTimeRemainingMinutesThreshold)) {
-    download_progress_timer_.Start(
-        FROM_HERE,
-        base::TimeDelta::FromSeconds(kTimeRemainingMinutesThreshold),
-        this,
+      time_remaining > kTimeRemainingThreshold) {
+    download_progress_timer_.Start(FROM_HERE, kTimeRemainingThreshold, this,
                                    &WebstoreInstaller::UpdateDownloadProgress);
   } else {
     download_progress_timer_.Stop();