Adding UseCounter specific for extensions

base/test/histogram_tester.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/histogram_tester.h"
 
 #include <stddef.h>
 
 #include "base/metrics/histogram.h"
 #include "base/metrics/histogram_samples.h"
@@ skipping 43 matching lines @@
   HistogramBase* histogram = StatisticsRecorder::FindHistogram(name);
   EXPECT_NE(nullptr, histogram) << "Histogram \"" << name
                                 << "\" does not exist.";
 
   if (histogram) {
     std::unique_ptr<HistogramSamples> samples = histogram->SnapshotSamples();
     CheckBucketCount(name, sample, expected_count, *samples);
   }
 }
 
+void HistogramTester::ExpectTotalCountExcept(const std::string& name,

[Nico, 2017/05/09 19:36:45]

Move this below ExpectTotalCount() so order in cc matches order in h file

[lunalu1, 2017/05/10 19:39:38]

Done.

+                                             HistogramBase::Sample sample,
+                                             HistogramBase::Count count) const {
+  HistogramBase* histogram = StatisticsRecorder::FindHistogram(name);
+  EXPECT_NE(nullptr, histogram)
+      << "Histogram \"" << name << "\" does not exist.";
+  if (histogram) {
+    std::unique_ptr<HistogramSamples> samples = histogram->SnapshotSamples();
+    CheckTotalCountExcept(name, sample, count, *samples);
+  } else {
+    // No histogram means there were zero samples.
+    EXPECT_EQ(count, 0) << "Histogram \"" << name << "\" does not exist.";
+  }
+}
+
 void HistogramTester::ExpectTotalCount(const std::string& name,
                                        HistogramBase::Count count) const {
   HistogramBase* histogram = StatisticsRecorder::FindHistogram(name);
   if (histogram) {
     std::unique_ptr<HistogramSamples> samples = histogram->SnapshotSamples();
     CheckTotalCount(name, count, *samples);
   } else {
     // No histogram means there were zero samples.
     EXPECT_EQ(count, 0) << "Histogram \"" << name << "\" does not exist.";
   }
@@ skipping 92 matching lines @@
   auto histogram_data = histograms_snapshot_.find(name);
   if (histogram_data != histograms_snapshot_.end())
     actual_count -= histogram_data->second->TotalCount();
 
   EXPECT_EQ(expected_count, actual_count)
       << "Histogram \"" << name
       << "\" does not have the right total number of samples ("
       << expected_count << "). It has (" << actual_count << ").";
 }
 
+void HistogramTester::CheckTotalCountExcept(

[Nico, 2017/05/09 19:36:45]

The new code in this file looks pretty similar to already-existing code in this
file. Alexei, do you have a good idea how we could share more code here?

[lunalu1, 2017/05/10 19:39:38]

IMHO, we can implement getters (privately if we don't want to expose them and
call shared getters in Exepect* and Check*). WDYT?

+    const std::string& name,
+    HistogramBase::Sample sample,
+    HistogramBase::Count expected_count,
+    const HistogramSamples& samples) const {
+  int actual_total_count = samples.TotalCount();
+  int actual_bucket_count = samples.GetCount(sample);
+
+  auto histogram_data = histograms_snapshot_.find(name);
+  if (histogram_data != histograms_snapshot_.end()) {
+    actual_total_count -= histogram_data->second->TotalCount();
+    actual_bucket_count -= histogram_data->second->GetCount(sample);
+  }
+  int actual_count = actual_total_count - actual_bucket_count;
+
+  EXPECT_EQ(expected_count, actual_count)
+      << "Histogram \"" << name
+      << "\" does not have the right total number of samples ("
+      << expected_count << "). It has (" << actual_count << ").";
+}
+
 bool Bucket::operator==(const Bucket& other) const {
   return min == other.min && count == other.count;
 }
 
 void PrintTo(const Bucket& bucket, std::ostream* os) {
   *os << "Bucket " << bucket.min << ": " << bucket.count;
 }
 
 }  // namespace base