Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2

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 "base/metrics/histogram.h"
 #include "base/metrics/histogram_samples.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/stl_util.h"
@@ skipping 55 matching lines @@
       base::StatisticsRecorder::FindHistogram(name);
   if (histogram) {
     scoped_ptr<base::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.";
   }
 }
 
+std::vector<Bucket> HistogramTester::GetAllSamples(const std::string& name) {
+  std::vector<Bucket> samples;
+  scoped_ptr<HistogramSamples> snapshot =
+      GetHistogramSamplesSinceCreation(name);
+  for (auto it = snapshot->Iterator(); !it->Done(); it->Next()) {
+    HistogramBase::Sample sample;
+    HistogramBase::Count count;
+    it->Get(&sample, nullptr, &count);
+    samples.push_back(Bucket(sample, count));
+  }
+  return samples;
+}
+
 scoped_ptr<HistogramSamples> HistogramTester::GetHistogramSamplesSinceCreation(
     const std::string& histogram_name) {
   HistogramBase* histogram = StatisticsRecorder::FindHistogram(histogram_name);
   if (!histogram)
     return scoped_ptr<HistogramSamples>();
   scoped_ptr<HistogramSamples> named_samples(histogram->SnapshotSamples());
   HistogramSamples* named_original_samples =
       histograms_snapshot_[histogram_name];
   if (named_original_samples)
     named_samples->Subtract(*named_original_samples);
@@ skipping 27 matching lines @@
   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 << ").";
 }
 
+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