metrics: Connect leak detector to allocator

components/metrics/leak_detector/leak_detector_unittest.cc

 // Copyright 2016 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 "components/metrics/leak_detector/leak_detector.h"
 
 #include <set>
 
+#include "base/allocator/allocator_extension.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace metrics {
 
 namespace {
 
 // Default values for LeakDetector params. See header file for the meaning of
@@ skipping 33 matching lines @@
   // one copy of each unique report.
   std::set<LeakReport, Comparator> reports_;
 
   DISALLOW_COPY_AND_ASSIGN(TestObserver);
 };
 
 }  // namespace
 
 class LeakDetectorTest : public ::testing::Test {
  public:
-  LeakDetectorTest()
-      : detector_(new LeakDetector(kDefaultSamplingRate,
-                                   kDefaultMaxCallStackUnwindDepth,
-                                   kDefaultAnalysisIntervalBytes,
-                                   kDefaultSizeSuspicionThreshold,
-                                   kDefaultCallStackSuspicionThreshold)) {}
+  LeakDetectorTest() : detector_(LeakDetector::GetInstance()) {
+    detector_->Init(kDefaultSamplingRate, kDefaultMaxCallStackUnwindDepth,
+                    kDefaultAnalysisIntervalBytes,
+                    kDefaultSizeSuspicionThreshold,
+                    kDefaultCallStackSuspicionThreshold);
+  }
 
  protected:
   // Use a scoped_ptr to hold the test object so it can be destroyed before the

[Will Harris, 2016/03/12 01:44:22]

nit:update comment

[Simon Que, 2016/03/14 19:17:01]

Done.

   // test is over.
-  scoped_ptr<LeakDetector> detector_;
+  LeakDetector* detector_;
 
  private:
   // For supporting content::BrowserThread operations.
   content::TestBrowserThreadBundle thread_bundle_;
 
   DISALLOW_COPY_AND_ASSIGN(LeakDetectorTest);
 };
 
 TEST_F(LeakDetectorTest, NotifyObservers) {
   // Generate two sets of leak reports.
@@ skipping 16 matching lines @@
   // Register three observers;
   TestObserver obs1, obs2, obs3;
   detector_->AddObserver(&obs1);
   detector_->AddObserver(&obs2);
   detector_->AddObserver(&obs3);
 
   // Pass both sets of reports to the leak detector.
   detector_->NotifyObservers(reports1);
   detector_->NotifyObservers(reports2);
 
-  // Shut down the leak detector before checking the reports, so that the
-  // stored reports can be examined without new reports being generated.
-  detector_.reset();
-
   // Check that all three observers got both sets of reports, passed in
   // separately.
   for (const TestObserver* obs : {&obs1, &obs2, &obs3}) {
     EXPECT_EQ(6U, obs->reports().size());
     for (const auto& report : {reports1[0], reports1[1], reports1[2],
                                reports2[0], reports2[1], reports2[2]}) {
       EXPECT_TRUE(obs->reports().find(report) != obs->reports().end());
     }
   }
 }
 
 }  // namespace metrics