Add histograms for network activity, and total/cumulative

chrome/browser/net/cache_stats.h

Index: chrome/browser/net/cache_stats.h
===================================================================
--- chrome/browser/net/cache_stats.h	(revision 150909)
+++ chrome/browser/net/cache_stats.h	(working copy)
@@ -51,11 +51,28 @@
     SPINNER_START,
     SPINNER_STOP
   };
+  enum RequestStatus {
+    REQUEST_STATUS_CACHE_WAIT,
+    REQUEST_STATUS_NETWORK_WAIT,
+    REQUEST_STATUS_ACTIVE,
+    REQUEST_STATUS_NONE,
+    REQUEST_STATUS_MAX
+  };
+  enum HistogramType {
+    HISTOGRAM_FINAL_AGGREGATE,
+    HISTOGRAM_FINAL_CUMULATIVE,
+    HISTOGRAM_FINAL_CUMULATIVE_PERCENTAGE,
+    HISTOGRAM_INTERMEDIATE_AGGREGATE,
+    HISTOGRAM_INTERMEDIATE_CUMULATIVE,
+    HISTOGRAM_INTERMEDIATE_CUMULATIVE_PERCENTAGE,
+    HISTOGRAM_MAX
+  };
+
   CacheStats();
   ~CacheStats();
 
-  void OnCacheWaitStateChange(const net::URLRequest& request,
-                              net::NetworkDelegate::CacheWaitState state);
+  void OnRequestWaitStateChange(const net::URLRequest& request,
+                                net::NetworkDelegate::RequestWaitState state);
   void OnTabEvent(std::pair<int, int> render_view_id, TabEvent event);
   void RegisterURLRequestContext(const net::URLRequestContext* context,
                                  ChromeURLRequestContext::ContextType type);
@@ -77,16 +94,13 @@
   void ScheduleTimer(TabLoadStats* stats);
   // The callback when a timer fires to collect stats again.
   void TimerCallback(TabLoadStats* stats);
-  // Helper function to put the current set of cache statistics into an UMA
-  // histogram.
-  void RecordCacheFractionHistogram(base::TimeDelta elapsed,
-                                    base::TimeDelta cache_time,
-                                    bool is_load_done,
-                                    int timer_index);
+  // Helper function to put the current set of statistics into UMA histograms.
+  void RecordHistograms(base::TimeDelta elapsed,
+                        TabLoadStats* stats,
+                        bool is_load_done);
 
   TabLoadStatsMap tab_load_stats_;
-  std::vector<base::Histogram*> final_histograms_;
-  std::vector<base::Histogram*> intermediate_histograms_;
+  std::vector<base::Histogram*> histograms_[REQUEST_STATUS_MAX][HISTOGRAM_MAX];
   base::hash_set<const net::URLRequestContext*> main_request_contexts_;
 
   DISALLOW_COPY_AND_ASSIGN(CacheStats);