Move prerender histograms out of prerender manager.

chrome/browser/prerender/prerender_manager.h

 // Copyright (c) 2011 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_PRERENDER_PRERENDER_MANAGER_H_
 #define CHROME_BROWSER_PRERENDER_PRERENDER_MANAGER_H_
 #pragma once
 
+#include <hash_set>
 #include <list>
 #include <map>
+#include <string>
 #include <vector>
 
 #include "base/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/task.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "chrome/browser/prerender/prerender_config.h"
 #include "chrome/browser/prerender/prerender_contents.h"
+#include "chrome/browser/prerender/prerender_final_status.h"
 #include "chrome/browser/prerender/prerender_origin.h"
 #include "googleurl/src/gurl.h"
 
 class Profile;
 class TabContents;
 
 #if defined(COMPILER_GCC)
 
 namespace __gnu_cxx {
 template <>
 struct hash<TabContents*> {
   std::size_t operator()(TabContents* value) const {
     return reinterpret_cast<std::size_t>(value);
   }
 };
 }
 
 #endif
 
 namespace prerender {
 
 class PrerenderCondition;
+class PrerenderHistograms;
 class PrerenderHistory;
 class PrerenderTracker;
 
 // PrerenderManager is responsible for initiating and keeping prerendered
 // views of webpages. All methods must be called on the UI thread unless
 // indicated otherwise.
 class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>,
                          public base::NonThreadSafe {
  public:
   // PrerenderManagerMode is used in a UMA_HISTOGRAM, so please do not
@@ skipping 262 matching lines @@
 
   // Returns a new Value representing the pages currently being prerendered. The
   // caller is responsible for delete'ing the return value.
   base::Value* GetActivePrerendersAsValue() const;
 
   // Destroys all pending prerenders using FinalStatus.  Also deletes them as
   // well as any swapped out TabContents queued for destruction.
   // Used both on destruction, and when clearing the browing history.
   void DestroyAllContents(FinalStatus final_status);
 
-  // Records the time from when a page starts prerendering to when the user
-  // navigates to it. This must be called on the UI thread.
-  void RecordTimeUntilUsed(base::TimeDelta time_until_used);
-
-  // Composes a histogram name based on a histogram type.
-  std::string ComposeHistogramName(const std::string& prefix_type,
-                                   const std::string& name) const;
-
-  // Returns the histogram name for a given origin and experiment.
-  std::string GetHistogramName(Origin origin, uint8 experiment_id,
-                               const std::string& name) const;
-  // Returns the histogram name for the current window.
-  std::string GetDefaultHistogramName(const std::string& name) const;
-  // Returns the current experiment.
-  uint8 GetCurrentExperimentId() const;
-  // Returns the current origin.
-  Origin GetCurrentOrigin() const;
-  // Returns whether or not there is currently an origin/experiment wash.
-  bool IsOriginExperimentWash() const;
-
   // The configuration.
   Config config_;
 
   // Specifies whether prerendering is currently enabled for this
   // manager. The value can change dynamically during the lifetime
   // of the PrerenderManager.
   bool enabled_;
 
   // The profile that owns this PrerenderManager.
   Profile* profile_;
@@ skipping 19 matching lines @@
 
   // Map of child/route id pairs to pending prerender data.
   typedef std::map<std::pair<int, int>, std::vector<PendingContentsData> >
       PendingPrerenderList;
   PendingPrerenderList pending_prerender_list_;
 
   scoped_ptr<PrerenderContents::Factory> prerender_contents_factory_;
 
   static PrerenderManagerMode mode_;
 
-  // An integer indicating a Prerendering Experiment being currently conducted.
-  // (The last experiment ID seen).
-  uint8 last_experiment_id_;
-
-  // Origin of the last prerender seen.
-  Origin last_origin_;
-
-  // A boolean indicating that we have recently encountered a combination of
-  // different experiments and origins, making an attribution of PPLT's to
-  // experiments / origins impossible.
-  bool origin_experiment_wash_;
-
-  // The time when we last saw a prerender request coming from a renderer.
-  // This is used to record perceived PLT's for a certain amount of time
-  // from the point that we last saw a <link rel=prerender> tag.
-  base::TimeTicks last_prerender_seen_time_;
-
   // A count of how many prerenders we do per session. Initialized to 0 then
   // incremented and emitted to a histogram on each successful prerender.
   static int prerenders_per_session_count_;
 
   // RepeatingTimer to perform periodic cleanups of pending prerendered
   // pages.
   base::RepeatingTimer<PrerenderManager> repeating_timer_;
 
   // Track time of last prerender to limit prerender spam.
   base::TimeTicks last_prerender_start_time_;
 
   std::list<TabContentsWrapper*> old_tab_contents_list_;
 
   // Cancels pending tasks on deletion.
   ScopedRunnableMethodFactory<PrerenderManager> runnable_method_factory_;
 
   ScopedVector<OnCloseTabContentsDeleter> on_close_tab_contents_deleters_;
 
   scoped_ptr<PrerenderHistory> prerender_history_;
 
   std::list<const PrerenderCondition*> prerender_conditions_;
 
+  scoped_ptr<PrerenderHistograms> histograms_;
+
   DISALLOW_COPY_AND_ASSIGN(PrerenderManager);
 };
 
 }  // namespace prerender
 
 #endif  // CHROME_BROWSER_PRERENDER_PRERENDER_MANAGER_H_