Move memory histograms generation to MetricsMemoryDetails.

chrome/browser/memory_details.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_MEMORY_DETAILS_H_
 #define CHROME_BROWSER_MEMORY_DETAILS_H_
 
 #include <map>
+#include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/process/process_handle.h"
 #include "base/process/process_metrics.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "chrome/browser/site_details.h"
 #include "content/public/common/process_type.h"
 
@@ skipping 59 matching lines @@
 
   base::string16 name;
   base::string16 process_name;
   ProcessMemoryInformationList processes;
 
   // Track site data for predicting process counts with out-of-process iframes.
   // See site_details.h.
   BrowserContextSiteDataMap site_data;
 };
 
-// MemoryGrowthTracker tracks latest metrics about record time and memory usage
-// at that time per process.
-class MemoryGrowthTracker {
- public:
-  MemoryGrowthTracker();
-  ~MemoryGrowthTracker();
-
-  // If 30 minutes have passed since last UMA record, UpdateSample() computes
-  // a difference between current memory usage |sample| of process |pid| and
-  // stored memory usage at the time of last UMA record. Then, it updates the
-  // stored memory usage to |sample|, stores the difference in |diff| and
-  // returns true.
-  // If no memory usage of |pid| has not been recorded so far or 30 minutes
-  // have not passed since last record, it just returns false.
-  // |sample| is memory usage in kB.
-  bool UpdateSample(base::ProcessId pid, int sample, int* diff);
-
- private:
-  // Latest metrics about record time and memory usage at that time per process.
-  // The second values of |memory_sizes_| are in kB.
-  std::map<base::ProcessId, base::TimeTicks> times_;
-  std::map<base::ProcessId, int> memory_sizes_;
-
-  DISALLOW_COPY_AND_ASSIGN(MemoryGrowthTracker);
-};
-
 #if defined(OS_MACOSX)
 class ProcessInfoSnapshot;
 #endif
 
 // MemoryDetails fetches memory details about current running browsers.
 // Because this data can only be fetched asynchronously, callers use
 // this class via a callback.
 //
 // Example usage:
 //
@@ skipping 25 matching lines @@
 
   // Constructor.
   MemoryDetails();
 
   // Access to the process detail information.  This data is only available
   // after OnDetailsAvailable() has been called.
   const std::vector<ProcessData>& processes() { return process_data_; }
 
   // Initiate updating the current memory details.  These are fetched
   // asynchronously because data must be collected from multiple threads.
-  // Updates UMA memory histograms if |mode| is UPDATE_USER_METRICS.
   // OnDetailsAvailable will be called when this process is complete.
-  void StartFetch(UserMetricsMode user_metrics_mode);
+  void StartFetch();
 
   virtual void OnDetailsAvailable() = 0;
 
   // Returns a string summarizing memory usage of the Chrome browser process
   // and all sub-processes, suitable for logging.
   std::string ToLogString();
 
  protected:
   friend class base::RefCountedThreadSafe<MemoryDetails>;
 
   virtual ~MemoryDetails();
 
-  // Set MemoryGrowthTracker into MemoryDetails.
-  void SetMemoryGrowthTracker(MemoryGrowthTracker* memory_growth_tracker);
+  // Returns a pointer to the ProcessData structure for Chrome.
+  ProcessData* ChromeBrowser();
+
+#if defined(OS_CHROMEOS)
+  const base::SwapInfo& swap_info() const { return swap_info_; }
+#endif
 
  private:
   // Collect child process information on the IO thread.  This is needed because
   // information about some child process types (i.e. plugins) can only be taken
   // on that thread.  The data will be used by about:memory.  When finished,
   // invokes back to the file thread to run the rest of the about:memory
   // functionality.
   void CollectChildInfoOnIOThread();
 
   // Collect current process information from the OS and store it
@@ skipping 11 matching lines @@
   void CollectProcessDataChrome(
       const std::vector<ProcessMemoryInformation>& child_info,
       base::ProcessId pid,
       const ProcessInfoSnapshot& process_info);
 #endif
 
   // Collect child process information on the UI thread.  Information about
   // renderer processes is only available there.
   void CollectChildInfoOnUIThread();
 
-  // Updates the global histograms for tracking memory usage.
-  void UpdateHistograms();
-
-#if defined(OS_CHROMEOS)
-  void UpdateSwapHistograms();
-#endif
-
-  // Returns a pointer to the ProcessData structure for Chrome.
-  ProcessData* ChromeBrowser();
-
   std::vector<ProcessData> process_data_;
 
-  UserMetricsMode user_metrics_mode_;
-
-  // A pointer to MemoryGrowthTracker which is contained in a longer-lived
-  // owner of MemoryDetails, for example, ChromeMetricsServiceClient.
-  // The pointer is NULL by default and set by SetMemoryGrowthTracker().
-  // If it is NULL, nothing is tracked.
-  MemoryGrowthTracker* memory_growth_tracker_;
-
 #if defined(OS_CHROMEOS)
   base::SwapInfo swap_info_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(MemoryDetails);
 };
 
 #endif  // CHROME_BROWSER_MEMORY_DETAILS_H_