Rework UMAHistogramHelper and StatisticsDeltaReader into [Chrome]HistogramTester.

base/test/histogram_tester_unittest.cc

 // Copyright 2014 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.
 
-#include "base/test/statistics_delta_reader.h"
+#include "base/test/histogram_tester.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/histogram_samples.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 
-TEST(StatisticsDeltaReaderTest, Scope) {
+TEST(HistogramTesterTest, Scope) {
   // Record a histogram before the creation of the recorder.
   UMA_HISTOGRAM_BOOLEAN("Test", true);
 
-  StatisticsDeltaReader reader;
+  HistogramTester tester;
 
   // Verify that no histogram is recorded.
   scoped_ptr<HistogramSamples> samples(
-      reader.GetHistogramSamplesSinceCreation("Test"));
+      tester.GetBaseHistogramSamples("Test"));
   EXPECT_FALSE(samples);
 
   // Record a histogram after the creation of the recorder.
   UMA_HISTOGRAM_BOOLEAN("Test", true);
 
   // Verify that one histogram is recorded.
-  samples = reader.GetHistogramSamplesSinceCreation("Test");
+  samples = tester.GetBaseHistogramSamples("Test");
   EXPECT_TRUE(samples);
   EXPECT_EQ(1, samples->TotalCount());
 }

[Ilya Sherman, 2014/07/15 03:56:35]

Please add test coverage for the other methods in the public API as well.

[Mike Lerman, 2014/07/16 17:29:03]

Done. I can add tests that will succeed, (e.g. log a 1, test for a 1), but I
don't think there's a way in GTest if I want an EXPECT_* to fail (e.g. log a 2,
call "ExpectUniqueSample" looking for 1), which means I can only test happy
paths.

 
 }  // namespace base