| Index: net/base/backoff_entry_unittest.cc
|
| diff --git a/net/base/backoff_entry_unittest.cc b/net/base/backoff_entry_unittest.cc
|
| index f5393e8e5663bbc40e35320008fd6f6bceca4ccc..bac7a056a700e554114019efa5255525619b9b36 100644
|
| --- a/net/base/backoff_entry_unittest.cc
|
| +++ b/net/base/backoff_entry_unittest.cc
|
| @@ -11,13 +11,12 @@ using base::TimeDelta;
|
| using base::TimeTicks;
|
| using net::BackoffEntry;
|
|
|
| -BackoffEntry::Policy base_policy = { 0, 1000, 2.0, 0.0, 20000, 2000, false };
|
| +BackoffEntry::Policy base_policy = {0, 1000, 2.0, 0.0, 20000, 2000, false};
|
|
|
| class TestBackoffEntry : public BackoffEntry {
|
| public:
|
| explicit TestBackoffEntry(const Policy* const policy)
|
| - : BackoffEntry(policy),
|
| - now_(TimeTicks()) {
|
| + : BackoffEntry(policy), now_(TimeTicks()) {
|
| // Work around initialization in constructor not picking up
|
| // fake time.
|
| SetCustomReleaseTime(TimeTicks());
|
| @@ -25,13 +24,9 @@ class TestBackoffEntry : public BackoffEntry {
|
|
|
| virtual ~TestBackoffEntry() {}
|
|
|
| - virtual TimeTicks ImplGetTimeNow() const override {
|
| - return now_;
|
| - }
|
| + virtual TimeTicks ImplGetTimeNow() const override { return now_; }
|
|
|
| - void set_now(const TimeTicks& now) {
|
| - now_ = now;
|
| - }
|
| + void set_now(const TimeTicks& now) { now_ = now; }
|
|
|
| private:
|
| TimeTicks now_;
|
| @@ -68,20 +63,20 @@ TEST(BackoffEntryTest, CanDiscard) {
|
| EXPECT_FALSE(entry.CanDiscard());
|
|
|
| // Test the case where there are errors but we can time out.
|
| - entry.set_now(
|
| - entry.GetReleaseTime() + TimeDelta::FromMilliseconds(1));
|
| + entry.set_now(entry.GetReleaseTime() + TimeDelta::FromMilliseconds(1));
|
| EXPECT_FALSE(entry.CanDiscard());
|
| - entry.set_now(entry.GetReleaseTime() + TimeDelta::FromMilliseconds(
|
| - base_policy.maximum_backoff_ms + 1));
|
| + entry.set_now(
|
| + entry.GetReleaseTime() +
|
| + TimeDelta::FromMilliseconds(base_policy.maximum_backoff_ms + 1));
|
| EXPECT_TRUE(entry.CanDiscard());
|
|
|
| // Test the final case (no errors, dependent only on specified lifetime).
|
| - entry.set_now(entry.GetReleaseTime() + TimeDelta::FromMilliseconds(
|
| - base_policy.entry_lifetime_ms - 1));
|
| + entry.set_now(entry.GetReleaseTime() +
|
| + TimeDelta::FromMilliseconds(base_policy.entry_lifetime_ms - 1));
|
| entry.InformOfRequest(true);
|
| EXPECT_FALSE(entry.CanDiscard());
|
| - entry.set_now(entry.GetReleaseTime() + TimeDelta::FromMilliseconds(
|
| - base_policy.entry_lifetime_ms));
|
| + entry.set_now(entry.GetReleaseTime() +
|
| + TimeDelta::FromMilliseconds(base_policy.entry_lifetime_ms));
|
| EXPECT_TRUE(entry.CanDiscard());
|
| }
|
|
|
| @@ -158,8 +153,8 @@ TEST(BackoffEntryTest, ReleaseTimeCalculation) {
|
| entry.InformOfRequest(false);
|
| entry.InformOfRequest(false);
|
| result = entry.GetReleaseTime();
|
| - EXPECT_EQ(
|
| - entry.ImplGetTimeNow() + TimeDelta::FromMilliseconds(20000), result);
|
| + EXPECT_EQ(entry.ImplGetTimeNow() + TimeDelta::FromMilliseconds(20000),
|
| + result);
|
| }
|
|
|
| TEST(BackoffEntryTest, ReleaseTimeCalculationAlwaysDelay) {
|
| @@ -209,10 +204,10 @@ TEST(BackoffEntryTest, ReleaseTimeCalculationWithJitter) {
|
| entry.InformOfRequest(false);
|
| entry.InformOfRequest(false);
|
| TimeTicks result = entry.GetReleaseTime();
|
| - EXPECT_LE(
|
| - entry.ImplGetTimeNow() + TimeDelta::FromMilliseconds(3200), result);
|
| - EXPECT_GE(
|
| - entry.ImplGetTimeNow() + TimeDelta::FromMilliseconds(4000), result);
|
| + EXPECT_LE(entry.ImplGetTimeNow() + TimeDelta::FromMilliseconds(3200),
|
| + result);
|
| + EXPECT_GE(entry.ImplGetTimeNow() + TimeDelta::FromMilliseconds(4000),
|
| + result);
|
| }
|
| }
|
|
|
| @@ -302,9 +297,9 @@ TEST(BackoffEntryTest, OverflowProtection) {
|
| // to represent the exponential backoff intermediate values. Given a multiply
|
| // factor of 256 (2^8), 129 iterations is enough: 2^(8*(129-1)) = 2^1024.
|
| for (int i = 0; i < 129; ++i) {
|
| - custom.set_now(custom.ImplGetTimeNow() + custom.GetTimeUntilRelease());
|
| - custom.InformOfRequest(false);
|
| - ASSERT_TRUE(custom.ShouldRejectRequest());
|
| + custom.set_now(custom.ImplGetTimeNow() + custom.GetTimeUntilRelease());
|
| + custom.InformOfRequest(false);
|
| + ASSERT_TRUE(custom.ShouldRejectRequest());
|
| }
|
|
|
| // Max delay should still be respected.
|
|
|