Fix StatisticsRecorder to handle re-entry during tests.

base/metrics/statistics_recorder_unittest.cc

Index: base/metrics/statistics_recorder_unittest.cc
diff --git a/base/metrics/statistics_recorder_unittest.cc b/base/metrics/statistics_recorder_unittest.cc
index 6be7d5bb881a893791f45c83e8ff552ffa69d452..bed1cd9f60727af1d56acfa1a3416beb1cbfee66 100644
--- a/base/metrics/statistics_recorder_unittest.cc
+++ b/base/metrics/statistics_recorder_unittest.cc
@@ -36,12 +36,13 @@ class StatisticsRecorderTest : public testing::Test {
   }
 
   void InitializeStatisticsRecorder() {
-    statistics_recorder_ = new StatisticsRecorder();
+    DCHECK(!statistics_recorder_);
+    StatisticsRecorder::UninitializeForTesting();
+    statistics_recorder_.reset(new StatisticsRecorder());
   }
 
   void UninitializeStatisticsRecorder() {
-    delete statistics_recorder_;
-    statistics_recorder_ = NULL;
+    statistics_recorder_.reset();
   }
 
   Histogram* CreateHistogram(const std::string& name,
@@ -59,11 +60,12 @@ class StatisticsRecorderTest : public testing::Test {
     delete histogram;
   }
 
-  StatisticsRecorder* statistics_recorder_;
+  std::unique_ptr<StatisticsRecorder> statistics_recorder_;
 };
 
 TEST_F(StatisticsRecorderTest, NotInitialized) {
   UninitializeStatisticsRecorder();
+  StatisticsRecorder::UninitializeForTesting();

[Alexei Svitkine (slow), 2016/04/08 15:04:19]

Shouldn't this be part of UninitializeStatisticsRecorder()?

[bcwhite, 2016/04/08 16:06:33]

It's not generally important since it's just a stack of SRs now.  This test,
however, specifically tests the functionality when that stack is empty so it was
necessary.

Can't see any harm in doing it all the time, though, so Done.

 
   ASSERT_FALSE(StatisticsRecorder::IsActive());