Remove Prerender.PageviewEvents histogram.

This also removes the top sites related classes that are no longer needed.

BUG=136376


Review URL: https://chromiumcodereview.appspot.com/10407038

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139853 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 0 insertions, 98 deletions

diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc
index 2e738773..2e6759b 100644
--- a/chrome/browser/prerender/prerender_manager.cc
+++ b/chrome/browser/prerender/prerender_manager.cc
@@ -20,7 +20,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
-#include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/prerender/prerender_condition.h"
 #include "chrome/browser/prerender/prerender_contents.h"
 #include "chrome/browser/prerender/prerender_field_trial.h"
@@ -195,60 +194,6 @@ struct PrerenderManager::NavigationRecord {
   }
 };
 
-class PrerenderManager::MostVisitedSites
-    : public content::NotificationObserver {
- public:
-  explicit MostVisitedSites(Profile* profile) :
-      profile_(profile) {
-    history::TopSites* top_sites = GetTopSites();
-    if (top_sites) {
-      registrar_.Add(this, chrome::NOTIFICATION_TOP_SITES_CHANGED,
-                     content::Source<history::TopSites>(top_sites));
-    }
-
-    UpdateMostVisited();
-  }
-
-  void UpdateMostVisited() {
-    history::TopSites* top_sites = GetTopSites();
-    if (top_sites) {
-      top_sites->GetMostVisitedURLs(
-          &topsites_consumer_,
-          base::Bind(&prerender::PrerenderManager::MostVisitedSites::
-              OnMostVisitedURLsAvailable, base::Unretained(this)));
-    }
-  }
-
-  void OnMostVisitedURLsAvailable(const history::MostVisitedURLList& data) {
-    urls_.clear();
-    for (int i = 0; i < static_cast<int>(data.size()); i++)
-      urls_.insert(data[i].url);
-  }
-
-  void Observe(int type,
-               const content::NotificationSource& source,
-               const content::NotificationDetails& details) {
-    DCHECK_EQ(type, chrome::NOTIFICATION_TOP_SITES_CHANGED);
-    UpdateMostVisited();
-  }
-
-  bool IsTopSite(const GURL& url) const {
-    return (urls_.count(url) > 0);
-  }
-
- private:
-  history::TopSites* GetTopSites() const {
-    if (profile_)
-      return profile_->GetTopSites();
-    return NULL;
-  }
-
-  CancelableRequestConsumer topsites_consumer_;
-  Profile* profile_;
-  content::NotificationRegistrar registrar_;
-  std::set<GURL> urls_;
-};
-
 PrerenderManager::PrerenderManager(Profile* profile,
                                    PrerenderTracker* prerender_tracker)
     : enabled_(true),
@@ -825,12 +770,6 @@ void PrerenderManager::AddCondition(const PrerenderCondition* condition) {
   prerender_conditions_.push_back(condition);
 }
 
-bool PrerenderManager::IsTopSite(const GURL& url) {
-  if (!most_visited_.get())
-    most_visited_.reset(new MostVisitedSites(profile_));
-  return most_visited_->IsTopSite(url);
-}
-
 bool PrerenderManager::IsPendingEntry(const GURL& url) const {
   DCHECK(CalledOnValidThread());
   for (PrerenderContentsDataList::const_iterator it = prerender_list_.begin();
diff --git a/chrome/browser/prerender/prerender_manager.h b/chrome/browser/prerender/prerender_manager.h
index 921de49..3d25b1c 100644
--- a/chrome/browser/prerender/prerender_manager.h
+++ b/chrome/browser/prerender/prerender_manager.h
@@ -239,8 +239,6 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>,
   // Adds a condition. This is owned by the PrerenderManager.
   void AddCondition(const PrerenderCondition* condition);
 
-  bool IsTopSite(const GURL& url);
-
   bool IsPendingEntry(const GURL& url) const;
 
   // Returns true if |url| matches any URLs being prerendered.
@@ -303,8 +301,6 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>,
 
   class OnCloseTabContentsDeleter;
 
-  class MostVisitedSites;
-
   typedef std::list<PrerenderContentsData> PrerenderContentsDataList;
   typedef base::hash_map<content::WebContents*, bool> WouldBePrerenderedMap;
 
@@ -494,8 +490,6 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>,
 
   scoped_ptr<PrerenderLocalPredictor> local_predictor_;
 
-  scoped_ptr<MostVisitedSites> most_visited_;
-
   DISALLOW_COPY_AND_ASSIGN(PrerenderManager);
 };
 
diff --git a/chrome/browser/prerender/prerender_tab_helper.cc b/chrome/browser/prerender/prerender_tab_helper.cc
index 2a78304..a84d79a 100644
--- a/chrome/browser/prerender/prerender_tab_helper.cc
+++ b/chrome/browser/prerender/prerender_tab_helper.cc
@@ -24,23 +24,6 @@ using content::WebContents;
 
 namespace prerender {
 
-namespace {
-
-enum PAGEVIEW_EVENTS {
-  PAGEVIEW_EVENT_NEW_URL = 0,
-  PAGEVIEW_EVENT_TOP_SITE_NEW_URL = 1,
-  PAGEVIEW_EVENT_LOAD_START = 2,
-  PAGEVIEW_EVENT_TOP_SITE_LOAD_START = 3,
-  PAGEVIEW_EVENT_MAX = 4
-};
-
-void RecordPageviewEvent(PAGEVIEW_EVENTS event) {
-  UMA_HISTOGRAM_ENUMERATION("Prerender.PageviewEvents",
-                            event, PAGEVIEW_EVENT_MAX);
-}
-
-}  // namespace
-
 // Helper class to compute pixel-based stats on the paint progress
 // between when a prerendered page is swapped in and when the onload event
 // fires.
@@ -159,9 +142,6 @@ void PrerenderTabHelper::ProvisionalChangeToMainFrameUrl(
     const GURL& opener_url,
     content::RenderViewHost* render_view_host) {
   url_ = url;
-  RecordPageviewEvent(PAGEVIEW_EVENT_NEW_URL);
-  if (IsTopSite(url))
-    RecordPageviewEvent(PAGEVIEW_EVENT_TOP_SITE_NEW_URL);
   PrerenderManager* prerender_manager = MaybeGetPrerenderManager();
   if (!prerender_manager)
     return;
@@ -225,10 +205,6 @@ void PrerenderTabHelper::DidStartProvisionalLoadForFrame(
       bool is_error_page,
       content::RenderViewHost* render_view_host) {
   if (is_main_frame) {
-    RecordPageviewEvent(PAGEVIEW_EVENT_LOAD_START);
-    if (IsTopSite(validated_url))
-      RecordPageviewEvent(PAGEVIEW_EVENT_TOP_SITE_LOAD_START);
-
     // Record the beginning of a new PPLT navigation.
     pplt_load_start_ = base::TimeTicks::Now();
     actual_load_start_ = base::TimeTicks();
@@ -273,9 +249,4 @@ void PrerenderTabHelper::PrerenderSwappedIn() {
   }
 }
 
-bool PrerenderTabHelper::IsTopSite(const GURL& url) {
-  PrerenderManager* pm = MaybeGetPrerenderManager();
-  return (pm && pm->IsTopSite(url));
-}
-
 }  // namespace prerender
diff --git a/chrome/browser/prerender/prerender_tab_helper.h b/chrome/browser/prerender/prerender_tab_helper.h
index 7baccbc..7036aa4 100644
--- a/chrome/browser/prerender/prerender_tab_helper.h
+++ b/chrome/browser/prerender/prerender_tab_helper.h
@@ -60,8 +60,6 @@ class PrerenderTabHelper : public content::WebContentsObserver {
   // Returns whether the WebContents being observed was prerendered.
   bool IsPrerendered();
 
-  bool IsTopSite(const GURL& url);
-
   // TabContentsWrapper we're created for.
   TabContentsWrapper* tab_;