Merge subprocess metrics into global StatisticsRecorder.

base/metrics/statistics_recorder.h

Index: base/metrics/statistics_recorder.h
diff --git a/base/metrics/statistics_recorder.h b/base/metrics/statistics_recorder.h
index 6c436c292e6987027276e0cdee49e60787ba1280..f40bb4e5495fcaa21fbdc59b9b22d65751ec9e29 100644
--- a/base/metrics/statistics_recorder.h
+++ b/base/metrics/statistics_recorder.h
@@ -26,6 +26,8 @@
 #include "base/metrics/histogram_base.h"
 #include "base/strings/string_piece.h"
 
+class SubprocessMetricsProviderTest;
+
 namespace base {
 
 class BucketRanges;
@@ -185,10 +187,12 @@ class BASE_EXPORT StatisticsRecorder {
   typedef std::map<uint32_t, std::list<const BucketRanges*>*> RangesMap;
 
   friend struct DefaultLazyInstanceTraits<StatisticsRecorder>;
+  friend class ::SubprocessMetricsProviderTest;
   friend class HistogramBaseTest;
   friend class HistogramSnapshotManagerTest;
   friend class HistogramTest;
   friend class JsonPrefStoreTest;
+  friend class PersistentHistogramAllocatorTest;
   friend class SharedHistogramTest;
   friend class SparseHistogramTest;
   friend class StatisticsRecorderTest;