Reorganize histograms for persistence.

base/test/histogram_tester.cc

Index: base/test/histogram_tester.cc
diff --git a/base/test/histogram_tester.cc b/base/test/histogram_tester.cc
index 7fcde6d60eebd4acd57d822aec9fbeca37798215..2cbad9368b0a52eb04ca30c9a3ffee27271f6224 100644
--- a/base/test/histogram_tester.cc
+++ b/base/test/histogram_tester.cc
@@ -6,6 +6,7 @@
 
 #include "base/metrics/histogram.h"
 #include "base/metrics/histogram_samples.h"
+#include "base/metrics/metrics_hashes.h"
 #include "base/metrics/sample_map.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/stl_util.h"
@@ -122,7 +123,8 @@ scoped_ptr<HistogramSamples> HistogramTester::GetHistogramSamplesSinceCreation(
   // creates empty samples in the absence of the histogram, rather than
   // returning null.
   if (!histogram)

[Alexei Svitkine (slow), 2015/12/09 23:03:40]

Nit: {}

[bcwhite, 2015/12/10 14:51:33]

Done.

-    return scoped_ptr<HistogramSamples>(new SampleMap);
+    return scoped_ptr<HistogramSamples>(
+        new SampleMap(HashMetricName(histogram_name)));
   scoped_ptr<HistogramSamples> named_samples(histogram->SnapshotSamples());
   auto original_samples_it = histograms_snapshot_.find(histogram_name);
   if (original_samples_it != histograms_snapshot_.end())