Use base::TimeDelta in SafeBrowsingProtocolManager.

chrome/browser/safe_browsing/protocol_manager_unittest.cc

 // 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.
 //
 
 #include "base/logging.h"
 #include "base/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "chrome/browser/safe_browsing/protocol_manager.h"
 
 using base::Time;
 using base::TimeDelta;
 
 static const char kUrlPrefix[] = "https://prefix.com/foo";
 static const char kClient[] = "unittest";
 static const char kAppVer[] = "1.0";
 static const char kAdditionalQuery[] = "additional_query";
 
 class SafeBrowsingProtocolManagerTest : public testing::Test {
 };
 
 // Ensure that we respect section 5 of the SafeBrowsing protocol specification.
 TEST_F(SafeBrowsingProtocolManagerTest, TestBackOffTimes) {
   SafeBrowsingProtocolManager pm(NULL, kClient, NULL, kUrlPrefix, false);
-  pm.next_update_sec_ = 1800;
+  pm.next_update_interval_ = base::TimeDelta::FromSeconds(1800);
   DCHECK(pm.back_off_fuzz_ >= 0.0 && pm.back_off_fuzz_ <= 1.0);

[mattm, 2012/09/12 20:00:03]

While you're here you could change this to some ASSERT_ tests instead of
dchecking.

[cbentzel, 2012/09/12 21:32:47]

This was the only DCHECK in the file -> converted to ASSERT_TRUE

 
+  base::TimeDelta next;
+
   // No errors received so far.
-  EXPECT_EQ(pm.GetNextUpdateTime(false), 1800 * 1000);
+  next = pm.GetNextUpdateInterval(false);
+  EXPECT_EQ(next, base::TimeDelta::FromSeconds(1800));
 
   // 1 error.
-  EXPECT_EQ(pm.GetNextUpdateTime(true), 60 * 1000);
+  next = pm.GetNextUpdateInterval(true);
+  EXPECT_EQ(next, base::TimeDelta::FromSeconds(60));
 
   // 2 errors.
-  int next_time = pm.GetNextUpdateTime(true) / (60 * 1000);  // Minutes
-  EXPECT_TRUE(next_time >= 30 && next_time <= 60);
+  next = pm.GetNextUpdateInterval(true);
+  EXPECT_TRUE(next >= base::TimeDelta::FromMinutes(30) &&
+              next <= base::TimeDelta::FromMinutes(60));
 
   // 3 errors.
-  next_time = pm.GetNextUpdateTime(true) / (60 * 1000);
-  EXPECT_TRUE(next_time >= 60 && next_time <= 120);
+  next = pm.GetNextUpdateInterval(true);
+  EXPECT_TRUE(next >= base::TimeDelta::FromMinutes(60) &&
+              next <= base::TimeDelta::FromMinutes(120));
 
   // 4 errors.
-  next_time = pm.GetNextUpdateTime(true) / (60 * 1000);
-  EXPECT_TRUE(next_time >= 120 && next_time <= 240);
+  next = pm.GetNextUpdateInterval(true);
+  EXPECT_TRUE(next >= base::TimeDelta::FromMinutes(120) &&
+              next <= base::TimeDelta::FromMinutes(240));
 
   // 5 errors.
-  next_time = pm.GetNextUpdateTime(true) / (60 * 1000);
-  EXPECT_TRUE(next_time >= 240 && next_time <= 480);
+  next = pm.GetNextUpdateInterval(true);
+  EXPECT_TRUE(next >= base::TimeDelta::FromMinutes(240) &&
+              next <= base::TimeDelta::FromMinutes(480));
 
   // 6 errors, reached max backoff.
-  EXPECT_EQ(pm.GetNextUpdateTime(true), 480 * 60 * 1000);
+  next = pm.GetNextUpdateInterval(true);
+  EXPECT_EQ(next, base::TimeDelta::FromMinutes(480));
 
   // 7 errors.
-  EXPECT_EQ(pm.GetNextUpdateTime(true), 480 * 60 * 1000);
+  next = pm.GetNextUpdateInterval(true);
+  EXPECT_EQ(next, base::TimeDelta::FromMinutes(480));
 
   // Received a successful response.
-  EXPECT_EQ(pm.GetNextUpdateTime(false), 1800 * 1000);
+  next = pm.GetNextUpdateInterval(false);
+  EXPECT_EQ(next, base::TimeDelta::FromSeconds(1800));
 }
 
 TEST_F(SafeBrowsingProtocolManagerTest, TestChunkStrings) {
   SafeBrowsingProtocolManager pm(NULL, kClient, NULL, kUrlPrefix, false);
 
   // Add and Sub chunks.
   SBListChunkRanges phish("goog-phish-shavar");
   phish.adds = "1,4,6,8-20,99";
   phish.subs = "16,32,64-96";
   EXPECT_EQ(pm.FormatList(phish),
@@ skipping 174 matching lines @@
   pm.set_additional_query(kAdditionalQuery);
   EXPECT_EQ("https://localhost:1234/foo/bar?foo&additional_query",
             pm.NextChunkUrl(url_partial).spec());
   EXPECT_EQ("http://localhost:1234/foo/bar?foo&additional_query",
             pm.NextChunkUrl(url_http_full).spec());
   EXPECT_EQ("https://localhost:1234/foo/bar?foo&additional_query",
             pm.NextChunkUrl(url_https_full).spec());
   EXPECT_EQ("https://localhost:1234/foo/bar?additional_query",
             pm.NextChunkUrl(url_https_no_query).spec());
 }