Revert 64687 - Try to detect internal corruption of histogram instances....

base/metrics/histogram_unittest.cc

 // Copyright (c) 2006-2008 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 "base/metrics/histogram.h"
 #include "base/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 290 matching lines @@
 
   // Check to see that the bucket counts reflect our additions.
   Histogram::SampleSet sample;
   histogram->SnapshotSample(&sample);
   EXPECT_EQ(INT_MAX, histogram->ranges(8));
   for (int i = 0; i < 8; i++)
     EXPECT_EQ(i + 1, sample.counts(i));
 }
 
 }  // namespace
-
-//------------------------------------------------------------------------------
-// We can't be an an anonymous namespace while being friends, so we pop back
-// out to the base namespace here.  We need to be friends to corrupt the
-// internals of the histogram and/or sampleset.
-TEST(HistogramTest, CorruptSampleCounts) {
-  scoped_refptr<Histogram> histogram = Histogram::FactoryGet(
-      "Histogram", 1, 64, 8, Histogram::kNoFlags);  // As per header file.
-
-  EXPECT_EQ(0, histogram->sample_.redundant_count());
-  histogram->Add(20);  // Add some samples.
-  histogram->Add(40);
-  EXPECT_EQ(2, histogram->sample_.redundant_count());
-
-  Histogram::SampleSet snapshot;
-  histogram->SnapshotSample(&snapshot);
-  EXPECT_EQ(Histogram::NO_INCONSISTENCIES, 0);
-  EXPECT_EQ(0, histogram->FindCorruption(snapshot));  // No default corruption.
-  EXPECT_EQ(2, snapshot.redundant_count());
-
-  snapshot.counts_[3] += 100;  // Sample count won't match redundant count.
-  EXPECT_EQ(Histogram::COUNT_LOW_ERROR, histogram->FindCorruption(snapshot));
-  snapshot.counts_[2] -= 200;
-  EXPECT_EQ(Histogram::COUNT_HIGH_ERROR, histogram->FindCorruption(snapshot));
-
-  // But we can't spot a corruption if it is compensated for.
-  snapshot.counts_[1] += 100;
-  EXPECT_EQ(0, histogram->FindCorruption(snapshot));
-}
-
-TEST(HistogramTest, CorruptBucketBounds) {
-  scoped_refptr<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.
-
-  std::swap(histogram->ranges_[1], histogram->ranges_[2]);
-  EXPECT_EQ(Histogram::BUCKET_ORDER_ERROR, histogram->FindCorruption(snapshot));
-
-  std::swap(histogram->ranges_[1], histogram->ranges_[2]);
-  EXPECT_EQ(0, histogram->FindCorruption(snapshot));
-
-  ++histogram->ranges_[3];
-  EXPECT_EQ(Histogram::RANGE_CHECKSUM_ERROR,
-            histogram->FindCorruption(snapshot));
-
-  // Repair histogram so that destructor won't DCHECK().
-  --histogram->ranges_[3];
-}
-
 }  // namespace base