eliminate some TimeDelta static initializers

BUG=94925
TEST=sizes.py should show one less chrome-si


Review URL: http://codereview.chromium.org/9295001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119397 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 29 insertions, 19 deletions

diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc
index 85c410e..9110266 100644
--- a/chrome/browser/safe_browsing/client_side_detection_service.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_service.cc
@@ -44,12 +44,9 @@ const int ClientSideDetectionService::kMaxReportsPerInterval = 3;
 const int ClientSideDetectionService::kClientModelFetchIntervalMs = 3600 * 1000;
 const int ClientSideDetectionService::kInitialClientModelFetchDelayMs = 10000;
 
-const base::TimeDelta ClientSideDetectionService::kReportsInterval =
-    base::TimeDelta::FromDays(1);
-const base::TimeDelta ClientSideDetectionService::kNegativeCacheInterval =
-    base::TimeDelta::FromDays(1);
-const base::TimeDelta ClientSideDetectionService::kPositiveCacheInterval =
-    base::TimeDelta::FromMinutes(30);
+const int ClientSideDetectionService::kReportsIntervalDays = 1;
+const int ClientSideDetectionService::kNegativeCacheIntervalDays = 1;
+const int ClientSideDetectionService::kPositiveCacheIntervalMinutes = 30;
 
 const char ClientSideDetectionService::kClientReportPhishingUrl[] =
     "https://sb-ssl.google.com/safebrowsing/clientreport/phishing";
@@ -410,8 +407,10 @@ bool ClientSideDetectionService::GetValidCachedResult(const GURL& url,
   // We still need to check if the result is valid.
   const CacheState& cache_state = *it->second;
   if (cache_state.is_phishing ?
-      cache_state.timestamp > base::Time::Now() - kPositiveCacheInterval :
-      cache_state.timestamp > base::Time::Now() - kNegativeCacheInterval) {
+      cache_state.timestamp > base::Time::Now() -
+          base::TimeDelta::FromMinutes(kPositiveCacheIntervalMinutes) :
+      cache_state.timestamp > base::Time::Now() -
+          base::TimeDelta::FromDays(kNegativeCacheIntervalDays)) {
     *is_phishing = cache_state.is_phishing;
     return true;
   }
@@ -424,9 +423,11 @@ void ClientSideDetectionService::UpdateCache() {
   // could be used for this purpose even if we will not use the entry to
   // satisfy the request from the cache.
   base::TimeDelta positive_cache_interval =
-      std::max(kPositiveCacheInterval, kReportsInterval);
+      std::max(base::TimeDelta::FromMinutes(kPositiveCacheIntervalMinutes),
+               base::TimeDelta::FromDays(kReportsIntervalDays));
   base::TimeDelta negative_cache_interval =
-      std::max(kNegativeCacheInterval, kReportsInterval);
+      std::max(base::TimeDelta::FromDays(kNegativeCacheIntervalDays),
+               base::TimeDelta::FromDays(kReportsIntervalDays));
 
   // Remove elements from the cache that will no longer be used.
   for (PhishingCache::iterator it = cache_.begin(); it != cache_.end();) {
@@ -446,7 +447,8 @@ bool ClientSideDetectionService::OverReportLimit() {
 }
 
 int ClientSideDetectionService::GetNumReports() {
-  base::Time cutoff = base::Time::Now() - kReportsInterval;
+  base::Time cutoff =
+      base::Time::Now() - base::TimeDelta::FromDays(kReportsIntervalDays);
 
   // Erase items older than cutoff because we will never care about them again.
   while (!phishing_report_times_.empty() &&
diff --git a/chrome/browser/safe_browsing/client_side_detection_service.h b/chrome/browser/safe_browsing/client_side_detection_service.h
index 83ae62a..19fd6aa 100644
--- a/chrome/browser/safe_browsing/client_side_detection_service.h
+++ b/chrome/browser/safe_browsing/client_side_detection_service.h
@@ -196,9 +196,9 @@ class ClientSideDetectionService : public content::URLFetcherDelegate,
   static const int kMaxReportsPerInterval;
   static const int kClientModelFetchIntervalMs;
   static const int kInitialClientModelFetchDelayMs;
-  static const base::TimeDelta kReportsInterval;
-  static const base::TimeDelta kNegativeCacheInterval;
-  static const base::TimeDelta kPositiveCacheInterval;
+  static const int kReportsIntervalDays;
+  static const int kNegativeCacheIntervalDays;
+  static const int kPositiveCacheIntervalMinutes;
 
   // Starts sending the request to the client-side detection frontends.
   // This method takes ownership of both pointers.
diff --git a/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc
index e17de28..dc80883 100644
--- a/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -122,24 +122,32 @@ class ClientSideDetectionServiceTest : public testing::Test {
   void TestCache() {
     ClientSideDetectionService::PhishingCache& cache = csd_service_->cache_;
     base::Time now = base::Time::Now();
-    base::Time time = now - ClientSideDetectionService::kNegativeCacheInterval +
+    base::Time time =
+        now - base::TimeDelta::FromDays(
+            ClientSideDetectionService::kNegativeCacheIntervalDays) +
         base::TimeDelta::FromMinutes(5);
     cache[GURL("http://first.url.com/")] =
         make_linked_ptr(new ClientSideDetectionService::CacheState(false,
                                                                    time));
 
-    time = now - ClientSideDetectionService::kNegativeCacheInterval -
+    time =
+        now - base::TimeDelta::FromDays(
+            ClientSideDetectionService::kNegativeCacheIntervalDays) -
         base::TimeDelta::FromHours(1);
     cache[GURL("http://second.url.com/")] =
         make_linked_ptr(new ClientSideDetectionService::CacheState(false,
                                                                    time));
 
-    time = now - ClientSideDetectionService::kPositiveCacheInterval -
+    time =
+        now - base::TimeDelta::FromMinutes(
+            ClientSideDetectionService::kPositiveCacheIntervalMinutes) -
         base::TimeDelta::FromMinutes(5);
     cache[GURL("http://third.url.com/")] =
         make_linked_ptr(new ClientSideDetectionService::CacheState(true, time));
 
-    time = now - ClientSideDetectionService::kPositiveCacheInterval +
+    time =
+        now - base::TimeDelta::FromMinutes(
+            ClientSideDetectionService::kPositiveCacheIntervalMinutes) +
         base::TimeDelta::FromMinutes(5);
     cache[GURL("http://fourth.url.com/")] =
         make_linked_ptr(new ClientSideDetectionService::CacheState(true, time));