Move memory histograms generation to MetricsMemoryDetails.

chrome/browser/metrics/chrome_metrics_service_client.cc

 // Copyright 2014 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 "chrome/browser/metrics/chrome_metrics_service_client.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 79 matching lines @@
       return metrics::SystemProfileProto::CHANNEL_DEV;
     case chrome::VersionInfo::CHANNEL_BETA:
       return metrics::SystemProfileProto::CHANNEL_BETA;
     case chrome::VersionInfo::CHANNEL_STABLE:
       return metrics::SystemProfileProto::CHANNEL_STABLE;
   }
   NOTREACHED();
   return metrics::SystemProfileProto::CHANNEL_UNKNOWN;
 }
 
-// Handles asynchronous fetching of memory details.
-// Will run the provided task after finished.
-class MetricsMemoryDetails : public MemoryDetails {
- public:
-  MetricsMemoryDetails(
-      const base::Closure& callback,
-      MemoryGrowthTracker* memory_growth_tracker)
-      : callback_(callback) {
-    SetMemoryGrowthTracker(memory_growth_tracker);
-  }
-
-  void OnDetailsAvailable() override {
-    base::MessageLoop::current()->PostTask(FROM_HERE, callback_);
-  }
-
- private:
-  ~MetricsMemoryDetails() override {}
-
-  base::Closure callback_;
-
-  DISALLOW_COPY_AND_ASSIGN(MetricsMemoryDetails);
-};
-
 }  // namespace
 
 ChromeMetricsServiceClient::ChromeMetricsServiceClient(
     metrics::MetricsStateManager* state_manager)
     : metrics_state_manager_(state_manager),
       chromeos_metrics_provider_(NULL),
       waiting_for_collect_final_metrics_step_(false),
       num_async_histogram_fetches_in_progress_(0),
       weak_ptr_factory_(this) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 107 matching lines @@
   // then call OnHistogramSynchronizationDone to continue processing.
   DCHECK(!waiting_for_collect_final_metrics_step_);
   waiting_for_collect_final_metrics_step_ = true;
 
   base::Closure callback =
       base::Bind(&ChromeMetricsServiceClient::OnMemoryDetailCollectionDone,
                  weak_ptr_factory_.GetWeakPtr());
 
   scoped_refptr<MetricsMemoryDetails> details(
       new MetricsMemoryDetails(callback, &memory_growth_tracker_));
-  details->StartFetch(MemoryDetails::UPDATE_USER_METRICS);
+  details->StartFetch();
 
   // Collect WebCore cache information to put into a histogram.
   for (content::RenderProcessHost::iterator i(
           content::RenderProcessHost::AllHostsIterator());
        !i.IsAtEnd(); i.Advance()) {
     i.GetCurrentValue()->Send(new ChromeViewMsg_GetCacheResourceStats());
   }
 }
 
 scoped_ptr<metrics::MetricsLogUploader>
@@ skipping 298 matching lines @@
   // Capture the histogram samples.
   if (dumps_with_crash != 0)
     UMA_HISTOGRAM_COUNTS("Chrome.BrowserDumpsWithCrash", dumps_with_crash);
   if (dumps_with_no_crash != 0)
     UMA_HISTOGRAM_COUNTS("Chrome.BrowserDumpsWithNoCrash", dumps_with_no_crash);
   int total_dumps = dumps_with_crash + dumps_with_no_crash;
   if (total_dumps != 0)
     UMA_HISTOGRAM_COUNTS("Chrome.BrowserCrashDumpAttempts", total_dumps);
 }
 #endif  // defined(OS_WIN)