Revert 148055 - Move CachedRanges out and add support for checksum.

base/metrics/histogram_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.
 
 // Test of Histogram class
 
 #include <algorithm>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/metrics/bucket_ranges.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 
 class HistogramTest : public testing::Test {
 };
 
@@ skipping 353 matching lines @@
 
 TEST(HistogramTest, CorruptBucketBounds) {
   Histogram* histogram(Histogram::FactoryGet(
       "Histogram", 1, 64, 8, Histogram::kNoFlags));  // As per header file.
 
   Histogram::SampleSet snapshot;
   histogram->SnapshotSample(&snapshot);
   EXPECT_EQ(Histogram::NO_INCONSISTENCIES, 0);
   EXPECT_EQ(0, histogram->FindCorruption(snapshot));  // No default corruption.
 
-  BucketRanges* bucket_ranges = histogram->bucket_ranges();
-  HistogramBase::Sample tmp = bucket_ranges->range(1);
-  bucket_ranges->set_range(1, bucket_ranges->range(2));
-  bucket_ranges->set_range(2, tmp);
+  CachedRanges* cached_ranges = histogram->cached_ranges();
+  std::swap(cached_ranges->ranges_[1], cached_ranges->ranges_[2]);
   EXPECT_EQ(Histogram::BUCKET_ORDER_ERROR | Histogram::RANGE_CHECKSUM_ERROR,
             histogram->FindCorruption(snapshot));
 
-  bucket_ranges->set_range(2, bucket_ranges->range(1));
-  bucket_ranges->set_range(1, tmp);
+  std::swap(cached_ranges->ranges_[1], cached_ranges->ranges_[2]);
   EXPECT_EQ(0, histogram->FindCorruption(snapshot));
 
-  bucket_ranges->set_range(3, bucket_ranges->range(3) + 1);
+  ++cached_ranges->ranges_[3];
   EXPECT_EQ(Histogram::RANGE_CHECKSUM_ERROR,
             histogram->FindCorruption(snapshot));
 
   // Show that two simple changes don't offset each other
-  bucket_ranges->set_range(4, bucket_ranges->range(4) - 1);
+  --cached_ranges->ranges_[4];
   EXPECT_EQ(Histogram::RANGE_CHECKSUM_ERROR,
             histogram->FindCorruption(snapshot));
 
   // Repair histogram so that destructor won't DCHECK().
-  bucket_ranges->set_range(3, bucket_ranges->range(3) - 1);
-  bucket_ranges->set_range(4, bucket_ranges->range(4) + 1);
+  --cached_ranges->ranges_[3];
+  ++cached_ranges->ranges_[4];
 }
 
 // Table was generated similarly to sample code for CRC-32 given on:
 // http://www.w3.org/TR/PNG/#D-CRCAppendix.
 TEST(HistogramTest, Crc32TableTest) {
   for (int i = 0; i < 256; ++i) {
     uint32 checksum = i;
     for (int j = 0; j < 8; ++j) {
       const uint32 kReversedPolynomial = 0xedb88320L;
       if (checksum & 1)
         checksum = kReversedPolynomial ^ (checksum >> 1);
       else
         checksum >>= 1;
     }
     EXPECT_EQ(Histogram::kCrcTable[i], checksum);
   }
 }
 
-// RangeTest, CustomRangeTest and CorruptBucketBounds test BucketRanges class.
-// The following tests sharing of BucketRanges object.
-TEST(HistogramTest, BucketRangesTest) {
+// RangeTest, CustomRangeTest and CorruptBucketBounds test CachedRanges class.
+// The following tests sharing of CachedRanges object.
+TEST(HistogramTest, CachedRangesTest) {
   StatisticsRecorder recorder;
   StatisticsRecorder::Histograms histograms;
 
   recorder.GetHistograms(&histograms);
   EXPECT_EQ(0U, histograms.size());
 
   Histogram* histogram1(Histogram::FactoryGet(
       "Histogram", 1, 64, 8, Histogram::kNoFlags));
 
   Histogram* histogram2(Histogram::FactoryGet(
       "Histogram2", 1, 64, 8, Histogram::kNoFlags));
 
   Histogram* histogram3(Histogram::FactoryGet(
       "Histogram3", 1, 64, 16, Histogram::kNoFlags));
 
-  BucketRanges* bucket_ranges1 = histogram1->bucket_ranges();
-  BucketRanges* bucket_ranges2 = histogram2->bucket_ranges();
-  BucketRanges* bucket_ranges3 = histogram3->bucket_ranges();
-  EXPECT_TRUE(bucket_ranges1->Equals(bucket_ranges2));
-  EXPECT_FALSE(bucket_ranges1->Equals(bucket_ranges3));
+  CachedRanges* cached_ranges1 = histogram1->cached_ranges();
+  CachedRanges* cached_ranges2 = histogram2->cached_ranges();
+  CachedRanges* cached_ranges3 = histogram3->cached_ranges();
+  EXPECT_TRUE(cached_ranges1->Equals(cached_ranges2));
+  EXPECT_FALSE(cached_ranges1->Equals(cached_ranges3));
 }
 
 }  // namespace base