Adding UseCounter specific for extensions

base/test/histogram_tester.h

 // 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.
 
 #ifndef BASE_TEST_HISTOGRAM_TESTER_H_
 #define BASE_TEST_HISTOGRAM_TESTER_H_
 
 #include <map>
 #include <memory>
 #include <ostream>
@@ skipping 36 matching lines @@
   void ExpectBucketCount(const std::string& name,
                          HistogramBase::Sample sample,
                          HistogramBase::Count expected_count) const;
 
   // We don't know the values of the samples, but we know how many there are.
   // This measures the diff from the snapshot taken when this object was
   // constructed.
   void ExpectTotalCount(const std::string& name,
                         HistogramBase::Count count) const;
 
+  // This tests total count of a given histogram, excluding one bucket, given
+  // the sample id.
+  void ExpectTotalCountExcept(const std::string& name,
+                              HistogramBase::Sample sample,

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

s/sample/except/

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

Done.

+                              HistogramBase::Count count) const;
+
   // We know exact number of samples for buckets corresponding to a time
   // interval. Other intervals may have samples too.
   void ExpectTimeBucketCount(const std::string& name,
                              TimeDelta sample,
                              HistogramBase::Count count) const;
 
   // Returns a list of all of the buckets recorded since creation of this
   // object, as vector<Bucket>, where the Bucket represents the min boundary of
   // the bucket and the count of samples recorded to that bucket since creation.
   //
@@ skipping 45 matching lines @@
                         Histogram::Count expected_count,
                         const HistogramSamples& samples) const;
 
   // Verifies that the total number of values recorded for the histogram |name|
   // is |expected_count|. This is checked against |samples| minus the snapshot
   // that was taken for |name|.
   void CheckTotalCount(const std::string& name,
                        Histogram::Count expected_count,
                        const HistogramSamples& samples) const;
 
+  // Verifies that the total number of values recorded for the histogram |name|,
+  // excluding the value in the |sample| bucket, matches the |expected_count|.
+  // The histogram's current total counts and its bucket's current value is
+  // determined from |samples| and is modified based on the snapshot restored
+  // for histogram |name|.

[Alexei Svitkine (slow), 2017/05/10 15:17:30]

I wonder if it wouldn't be better to just have functions to get the total counts
and the counts for the buckets and do this testing in the caller?

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

That was my initial thought. But after seeing that no other getters were
implemented, I decided to write a tester instead (thinking that this might be
what the owner would like to keep). But I could totally write 2 callers instead.

[Alexei Svitkine (slow), 2017/05/10 19:45:19]

I agree that it would be different with how the class is currently designed, but
I think it would be a positive change. The current design comes with some
downsides - specifically if you have multiple calls to this, you won't know
which one failed since the file/line number you'll get is from within the helper
class and not the test.

I think it's fine to introduce getters in this CL and do the tests outside the
class - sure it will create an inconsistency but I think it's better than adding
very custom Check functions that are only used from a single place.

+  void CheckTotalCountExcept(const std::string& name,
+                             HistogramBase::Sample sample,

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

I'd s/sample/except/ here too

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

Done.

+                             Histogram::Count expected_count,
+                             const HistogramSamples& samples) const;
+
   // Used to determine the histogram changes made during this instance's
   // lifecycle.
   std::map<std::string, std::unique_ptr<HistogramSamples>> histograms_snapshot_;
 
   DISALLOW_COPY_AND_ASSIGN(HistogramTester);
 };
 
 struct Bucket {
   Bucket(HistogramBase::Sample min, HistogramBase::Count count)
       : min(min), count(count) {}
 
   bool operator==(const Bucket& other) const;
 
   HistogramBase::Sample min;
   HistogramBase::Count count;
 };
 
 void PrintTo(const Bucket& value, std::ostream* os);
 
 }  // namespace base
 
 #endif  // BASE_TEST_HISTOGRAM_TESTER_H_