Merge 32311 - Hold histograms in static variables instead of allocating heap....

chrome/browser/net/websocket_experiment/websocket_experiment_runner.h

Index: chrome/browser/net/websocket_experiment/websocket_experiment_runner.h
===================================================================
--- chrome/browser/net/websocket_experiment/websocket_experiment_runner.h	(revision 33184)
+++ chrome/browser/net/websocket_experiment/websocket_experiment_runner.h	(working copy)
@@ -37,8 +37,6 @@
   void Cancel();
 
  private:
-  typedef std::map<std::string, linked_ptr<Histogram> > HistogramMap;
-
   enum State {
     STATE_NONE,
     STATE_IDLE,
@@ -51,28 +49,16 @@
   friend class base::RefCountedThreadSafe<WebSocketExperimentRunner>;
 
   void InitConfig();
-  void InitHistograms();
   void DoLoop();
   void OnTaskCompleted(int result);
   void UpdateTaskResultHistogram(const WebSocketExperimentTask* task);
 
-  template<class HistogramType, typename HistogramSample>
-  void InitHistogram(const char* type_name,
-                     HistogramSample min, HistogramSample max,
-                     size_t bucket_count);
-
-  Histogram* GetHistogram(const std::string& type_name) const;
-
   Config config_;
   State next_state_;
   State task_state_;
   scoped_ptr<WebSocketExperimentTask> task_;
   net::CompletionCallbackImpl<WebSocketExperimentRunner> task_callback_;
 
-  HistogramMap ws_histograms_;
-  HistogramMap wss_histograms_;
-  HistogramMap ws_nondefault_histograms_;
-
   DISALLOW_COPY_AND_ASSIGN(WebSocketExperimentRunner);
 };