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

Unified Diff: chrome/browser/safe_browsing/protocol_manager_unittest.cc

Issue 10933047: Use base::TimeDelta in SafeBrowsingProtocolManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: React to mattm review Created 8 years, 3 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
Index: chrome/browser/safe_browsing/protocol_manager_unittest.cc
diff --git a/chrome/browser/safe_browsing/protocol_manager_unittest.cc b/chrome/browser/safe_browsing/protocol_manager_unittest.cc
index 28b66666adbd6417bb4e0affa6c447786789be4d..c04bc7aea710853a8e9c916f2b2ec60b65e02753 100644
--- a/chrome/browser/safe_browsing/protocol_manager_unittest.cc
+++ b/chrome/browser/safe_browsing/protocol_manager_unittest.cc
@@ -22,39 +22,50 @@ 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;
- DCHECK(pm.back_off_fuzz_ >= 0.0 && pm.back_off_fuzz_ <= 1.0);
+ pm.next_update_interval_ = base::TimeDelta::FromSeconds(1800);
+ ASSERT_TRUE(pm.back_off_fuzz_ >= 0.0 && pm.back_off_fuzz_ <= 1.0);
+
+ 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) {
« no previous file with comments | « chrome/browser/safe_browsing/protocol_manager.cc ('k') | chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698