diff options
Diffstat (limited to 'chromium/net/url_request/url_request_throttler_unittest.cc')
-rw-r--r-- | chromium/net/url_request/url_request_throttler_unittest.cc | 80 |
1 files changed, 14 insertions, 66 deletions
diff --git a/chromium/net/url_request/url_request_throttler_unittest.cc b/chromium/net/url_request/url_request_throttler_unittest.cc index b964b108551..32f94ff0fd5 100644 --- a/chromium/net/url_request/url_request_throttler_unittest.cc +++ b/chromium/net/url_request/url_request_throttler_unittest.cc @@ -5,13 +5,12 @@ #include "net/url_request/url_request_throttler_manager.h" #include "base/memory/scoped_ptr.h" -#include "base/metrics/histogram.h" #include "base/metrics/histogram_samples.h" -#include "base/metrics/statistics_recorder.h" #include "base/pickle.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" +#include "base/test/statistics_delta_reader.h" #include "base/time/time.h" #include "net/base/load_flags.h" #include "net/base/request_priority.h" @@ -29,10 +28,7 @@ namespace net { namespace { -using base::Histogram; -using base::HistogramBase; -using base::HistogramSamples; -using base::StatisticsRecorder; +const char kRequestThrottledHistogramName[] = "Throttling.RequestThrottled"; class MockURLRequestThrottlerEntry : public URLRequestThrottlerEntry { public: @@ -177,75 +173,21 @@ class URLRequestThrottlerEntryTest : public testing::Test { : request_(GURL(), DEFAULT_PRIORITY, NULL, &context_) {} virtual void SetUp(); - virtual void TearDown(); - - // After calling this function, histogram snapshots in |samples_| contain - // only the delta caused by the test case currently running. - void CalculateHistogramDeltas(); TimeTicks now_; MockURLRequestThrottlerManager manager_; // Dummy object, not used. scoped_refptr<MockURLRequestThrottlerEntry> entry_; - std::map<std::string, HistogramSamples*> original_samples_; - std::map<std::string, HistogramSamples*> samples_; - TestURLRequestContext context_; TestURLRequest request_; }; -// List of all histograms we care about in these unit tests. -const char* kHistogramNames[] = { - "Throttling.FailureCountAtSuccess", - "Throttling.PerceivedDowntime", - "Throttling.RequestThrottled", - "Throttling.SiteOptedOut", -}; - void URLRequestThrottlerEntryTest::SetUp() { request_.SetLoadFlags(0); now_ = TimeTicks::Now(); entry_ = new MockURLRequestThrottlerEntry(&manager_); entry_->ResetToBlank(now_); - - for (size_t i = 0; i < arraysize(kHistogramNames); ++i) { - // Must retrieve original samples for each histogram for comparison - // as other tests may affect them. - const char* name = kHistogramNames[i]; - HistogramBase* histogram = StatisticsRecorder::FindHistogram(name); - if (histogram) { - original_samples_[name] = histogram->SnapshotSamples().release(); - } else { - original_samples_[name] = NULL; - } - } -} - -void URLRequestThrottlerEntryTest::TearDown() { - STLDeleteValues(&original_samples_); - STLDeleteValues(&samples_); -} - -void URLRequestThrottlerEntryTest::CalculateHistogramDeltas() { - for (size_t i = 0; i < arraysize(kHistogramNames); ++i) { - const char* name = kHistogramNames[i]; - HistogramSamples* original = original_samples_[name]; - - HistogramBase* histogram = StatisticsRecorder::FindHistogram(name); - if (histogram) { - ASSERT_EQ(HistogramBase::kUmaTargetedHistogramFlag, histogram->flags()); - - scoped_ptr<HistogramSamples> samples(histogram->SnapshotSamples()); - if (original) - samples->Subtract(*original); - samples_[name] = samples.release(); - } - } - - // Ensure we don't accidentally use the originals in our tests. - STLDeleteValues(&original_samples_); - original_samples_.clear(); } std::ostream& operator<<(std::ostream& out, const base::TimeTicks& time) { @@ -265,6 +207,7 @@ 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)); EXPECT_TRUE(entry_->ShouldRejectRequest(request_)); @@ -273,21 +216,26 @@ TEST_F(URLRequestThrottlerEntryTest, InterfaceDuringExponentialBackoff) { request_.SetLoadFlags(LOAD_MAYBE_USER_GESTURE); EXPECT_FALSE(entry_->ShouldRejectRequest(request_)); - CalculateHistogramDeltas(); - ASSERT_EQ(1, samples_["Throttling.RequestThrottled"]->GetCount(0)); - ASSERT_EQ(1, samples_["Throttling.RequestThrottled"]->GetCount(1)); + scoped_ptr<base::HistogramSamples> samples( + statistics_delta_reader.GetHistogramSamplesSinceCreation( + kRequestThrottledHistogramName)); + ASSERT_EQ(1, samples->GetCount(0)); + ASSERT_EQ(1, samples->GetCount(1)); } 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)); EXPECT_FALSE(entry_->ShouldRejectRequest(request_)); - CalculateHistogramDeltas(); - ASSERT_EQ(2, samples_["Throttling.RequestThrottled"]->GetCount(0)); - ASSERT_EQ(0, samples_["Throttling.RequestThrottled"]->GetCount(1)); + scoped_ptr<base::HistogramSamples> samples( + statistics_delta_reader.GetHistogramSamplesSinceCreation( + kRequestThrottledHistogramName)); + ASSERT_EQ(2, samples->GetCount(0)); + ASSERT_EQ(0, samples->GetCount(1)); } TEST_F(URLRequestThrottlerEntryTest, InterfaceUpdateFailure) { |