Move memory histograms generation to MetricsMemoryDetails.

chrome/browser/metrics/metrics_memory_details_browsertest.cc

Index: chrome/browser/metrics/metrics_memory_details_browsertest.cc
diff --git a/chrome/browser/memory_details_browsertest.cc b/chrome/browser/metrics/metrics_memory_details_browsertest.cc
similarity index 66%
rename from chrome/browser/memory_details_browsertest.cc
rename to chrome/browser/metrics/metrics_memory_details_browsertest.cc
index 9ee40c9997359b96a9e2f3f8b0125e8031c1a175..fc9a3414ec632851b14e7505146af056a37d1d00 100644
--- a/chrome/browser/memory_details_browsertest.cc
+++ b/chrome/browser/metrics/metrics_memory_details_browsertest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/memory_details.h"
+#include "chrome/browser/metrics/metrics_memory_details.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/test/histogram_tester.h"
@@ -11,12 +11,15 @@
 
 namespace {
 
-class TestMemoryDetails : public MemoryDetails {
+void DoNothing() {
+}

[Ilya Sherman, 2015/01/16 04:57:36]

FWIW, this is also defined in base/bind_helpers.h.

[Alexei Svitkine (slow), 2015/01/16 16:07:50]

Done.

+
+class TestMemoryDetails : public MetricsMemoryDetails {
  public:
-  TestMemoryDetails() {}
+  TestMemoryDetails() : MetricsMemoryDetails(base::Bind(&DoNothing), nullptr) {}
 
   void StartFetchAndWait() {
-    StartFetch(UPDATE_USER_METRICS);
+    StartFetch();
     content::RunMessageLoop();
   }
 
@@ -24,6 +27,7 @@ class TestMemoryDetails : public MemoryDetails {
   ~TestMemoryDetails() override {}
 
   void OnDetailsAvailable() override {
+    MetricsMemoryDetails::OnDetailsAvailable();
     // Exit the loop initiated by StartFetchAndWait().
     base::MessageLoop::current()->Quit();
   }
@@ -33,16 +37,16 @@ class TestMemoryDetails : public MemoryDetails {
 
 }  // namespace
 
-class MemoryDetailsBrowserTest : public InProcessBrowserTest {
+class MetricsMemoryDetailsBrowserTest : public InProcessBrowserTest {
  public:
-  MemoryDetailsBrowserTest() {}
-  ~MemoryDetailsBrowserTest() override {}
+  MetricsMemoryDetailsBrowserTest() {}
+  ~MetricsMemoryDetailsBrowserTest() override {}
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(MemoryDetailsBrowserTest);
+  DISALLOW_COPY_AND_ASSIGN(MetricsMemoryDetailsBrowserTest);
 };
 
-IN_PROC_BROWSER_TEST_F(MemoryDetailsBrowserTest, TestMemoryDetails) {
+IN_PROC_BROWSER_TEST_F(MetricsMemoryDetailsBrowserTest, TestMemoryDetails) {
   base::HistogramTester histogram_tester;
 
   scoped_refptr<TestMemoryDetails> details(new TestMemoryDetails);