| Index: net/url_request/url_request_throttler_unittest.cc
|
| diff --git a/net/url_request/url_request_throttler_unittest.cc b/net/url_request/url_request_throttler_unittest.cc
|
| index 32f94ff0fd562bf2e17016b12e424c1c36ee5cd5..59bf6b2953581b1dfa893573a822cf5f6c3b00d8 100644
|
| --- a/net/url_request/url_request_throttler_unittest.cc
|
| +++ b/net/url_request/url_request_throttler_unittest.cc
|
| @@ -95,10 +95,8 @@ class MockURLRequestThrottlerEntry : public URLRequestThrottlerEntry {
|
| return URLRequestThrottlerEntry::sliding_window_release_time();
|
| }
|
|
|
| - void set_sliding_window_release_time(
|
| - const base::TimeTicks& release_time) {
|
| - URLRequestThrottlerEntry::set_sliding_window_release_time(
|
| - release_time);
|
| + void set_sliding_window_release_time(const base::TimeTicks& release_time) {
|
| + URLRequestThrottlerEntry::set_sliding_window_release_time(release_time);
|
| }
|
|
|
| TimeTicks fake_time_now_;
|
| @@ -131,10 +129,9 @@ class MockURLRequestThrottlerManager : public URLRequestThrottlerManager {
|
| std::string fake_url_string("http://www.fakeurl.com/");
|
| fake_url_string.append(base::IntToString(create_entry_index_++));
|
| GURL fake_url(fake_url_string);
|
| - OverrideEntryForTests(
|
| - fake_url,
|
| - new MockURLRequestThrottlerEntry(this, time, TimeTicks::Now(),
|
| - TimeTicks::Now()));
|
| + OverrideEntryForTests(fake_url,
|
| + new MockURLRequestThrottlerEntry(
|
| + this, time, TimeTicks::Now(), TimeTicks::Now()));
|
| }
|
|
|
| private:
|
| @@ -197,8 +194,8 @@ std::ostream& operator<<(std::ostream& out, const base::TimeTicks& time) {
|
| TEST_F(URLRequestThrottlerEntryTest, CanThrottleRequest) {
|
| TestNetworkDelegate d;
|
| context_.set_network_delegate(&d);
|
| - entry_->set_exponential_backoff_release_time(
|
| - entry_->fake_time_now_ + TimeDelta::FromMilliseconds(1));
|
| + entry_->set_exponential_backoff_release_time(entry_->fake_time_now_ +
|
| + TimeDelta::FromMilliseconds(1));
|
|
|
| d.set_can_throttle_requests(false);
|
| EXPECT_FALSE(entry_->ShouldRejectRequest(request_));
|
| @@ -208,8 +205,8 @@ TEST_F(URLRequestThrottlerEntryTest, CanThrottleRequest) {
|
|
|
| TEST_F(URLRequestThrottlerEntryTest, InterfaceDuringExponentialBackoff) {
|
| base::StatisticsDeltaReader statistics_delta_reader;
|
| - entry_->set_exponential_backoff_release_time(
|
| - entry_->fake_time_now_ + TimeDelta::FromMilliseconds(1));
|
| + entry_->set_exponential_backoff_release_time(entry_->fake_time_now_ +
|
| + TimeDelta::FromMilliseconds(1));
|
| EXPECT_TRUE(entry_->ShouldRejectRequest(request_));
|
|
|
| // Also end-to-end test the load flags exceptions.
|
| @@ -227,8 +224,8 @@ TEST_F(URLRequestThrottlerEntryTest, InterfaceNotDuringExponentialBackoff) {
|
| base::StatisticsDeltaReader statistics_delta_reader;
|
| entry_->set_exponential_backoff_release_time(entry_->fake_time_now_);
|
| EXPECT_FALSE(entry_->ShouldRejectRequest(request_));
|
| - entry_->set_exponential_backoff_release_time(
|
| - entry_->fake_time_now_ - TimeDelta::FromMilliseconds(1));
|
| + entry_->set_exponential_backoff_release_time(entry_->fake_time_now_ -
|
| + TimeDelta::FromMilliseconds(1));
|
| EXPECT_FALSE(entry_->ShouldRejectRequest(request_));
|
|
|
| scoped_ptr<base::HistogramSamples> samples(
|
| @@ -277,8 +274,8 @@ TEST_F(URLRequestThrottlerEntryTest, IsEntryReallyOutdated) {
|
|
|
| for (unsigned int i = 0; i < arraysize(test_values); ++i) {
|
| entry_->set_exponential_backoff_release_time(test_values[i].time);
|
| - EXPECT_EQ(entry_->IsEntryOutdated(), test_values[i].result) <<
|
| - "Test case #" << i << " line " << test_values[i].line << " failed";
|
| + EXPECT_EQ(entry_->IsEntryOutdated(), test_values[i].result)
|
| + << "Test case #" << i << " line " << test_values[i].line << " failed";
|
| }
|
| }
|
|
|
| @@ -313,16 +310,16 @@ TEST_F(URLRequestThrottlerEntryTest, MalformedContent) {
|
|
|
| TEST_F(URLRequestThrottlerEntryTest, SlidingWindow) {
|
| int max_send = URLRequestThrottlerEntry::kDefaultMaxSendThreshold;
|
| - int sliding_window =
|
| - URLRequestThrottlerEntry::kDefaultSlidingWindowPeriodMs;
|
| + int sliding_window = URLRequestThrottlerEntry::kDefaultSlidingWindowPeriodMs;
|
|
|
| - TimeTicks time_1 = entry_->fake_time_now_ +
|
| - TimeDelta::FromMilliseconds(sliding_window / 3);
|
| + TimeTicks time_1 =
|
| + entry_->fake_time_now_ + TimeDelta::FromMilliseconds(sliding_window / 3);
|
| TimeTicks time_2 = entry_->fake_time_now_ +
|
| - TimeDelta::FromMilliseconds(2 * sliding_window / 3);
|
| - TimeTicks time_3 = entry_->fake_time_now_ +
|
| - TimeDelta::FromMilliseconds(sliding_window);
|
| - TimeTicks time_4 = entry_->fake_time_now_ +
|
| + TimeDelta::FromMilliseconds(2 * sliding_window / 3);
|
| + TimeTicks time_3 =
|
| + entry_->fake_time_now_ + TimeDelta::FromMilliseconds(sliding_window);
|
| + TimeTicks time_4 =
|
| + entry_->fake_time_now_ +
|
| TimeDelta::FromMilliseconds(sliding_window + 2 * sliding_window / 3);
|
|
|
| entry_->set_exponential_backoff_release_time(time_1);
|
| @@ -354,9 +351,7 @@ class URLRequestThrottlerManagerTest : public testing::Test {
|
| URLRequestThrottlerManagerTest()
|
| : request_(GURL(), DEFAULT_PRIORITY, NULL, &context_) {}
|
|
|
| - virtual void SetUp() {
|
| - request_.SetLoadFlags(0);
|
| - }
|
| + virtual void SetUp() { request_.SetLoadFlags(0); }
|
|
|
| // context_ must be declared before request_.
|
| TestURLRequestContext context_;
|
| @@ -393,8 +388,8 @@ TEST_F(URLRequestThrottlerManagerTest, IsUrlStandardised) {
|
|
|
| for (unsigned int i = 0; i < arraysize(test_values); ++i) {
|
| std::string temp = manager.DoGetUrlIdFromUrl(test_values[i].url);
|
| - EXPECT_EQ(temp, test_values[i].result) <<
|
| - "Test case #" << i << " line " << test_values[i].line << " failed";
|
| + EXPECT_EQ(temp, test_values[i].result) << "Test case #" << i << " line "
|
| + << test_values[i].line << " failed";
|
| }
|
| }
|
|
|
|
|