[prerender] Clean up PrerenderTabHelper

PrerenderTabHelper at the moment listens to a number of methods,
including DidStartNavigation and DidRedirectNavigation without using
them.

Delete them as they are not needed.

R=tbansal@chromium.org

Change-Id: I4c9de8c10aab644b165e49399088c05b99f80043
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2066790
Commit-Queue: Alexander Timin <altimin@chromium.org>
Reviewed-by: Tarun Bansal <tbansal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746466}

chrome/browser/prerender/prerender_tab_helper.cc

@@ -20,10 +20,9 @@ using content::WebContents;
 namespace prerender {
 
 PrerenderTabHelper::PrerenderTabHelper(content::WebContents* web_contents)
-    : content::WebContentsObserver(web_contents), origin_(ORIGIN_NONE) {}
+    : content::WebContentsObserver(web_contents) {}
 
-PrerenderTabHelper::~PrerenderTabHelper() {
-}
+PrerenderTabHelper::~PrerenderTabHelper() = default;
 
 void PrerenderTabHelper::DidFinishNavigation(
       content::NavigationHandle* navigation_handle) {
@@ -33,40 +32,12 @@ void PrerenderTabHelper::DidFinishNavigation(
     return;
   }
 
-  url_ = navigation_handle->GetURL();
   PrerenderManager* prerender_manager = MaybeGetPrerenderManager();
   if (!prerender_manager)
     return;
-  if (prerender_manager->IsWebContentsPrerendering(web_contents(), NULL))
-    return;
-  prerender_manager->RecordNavigation(url_);
-}
-
-void PrerenderTabHelper::DidStartNavigation(
-    content::NavigationHandle* navigation_handle) {
-  // Determine the origin.
-  PrerenderManager* prerender_manager = MaybeGetPrerenderManager();
-  if (prerender_manager)
-    prerender_manager->IsWebContentsPrerendering(web_contents(), &origin_);
-
-  if (navigation_handle->IsSameDocument())
+  if (prerender_manager->IsWebContentsPrerendering(web_contents(), nullptr))
     return;
-
-  if (!navigation_handle->IsInMainFrame())
-    return;
-
-  MainFrameUrlDidChange(navigation_handle->GetURL());
-}
-
-void PrerenderTabHelper::DidRedirectNavigation(
-    content::NavigationHandle* navigation_handle) {
-  if (!navigation_handle->IsInMainFrame())
-    return;
-  MainFrameUrlDidChange(navigation_handle->GetURL());
-}
-
-void PrerenderTabHelper::MainFrameUrlDidChange(const GURL& url) {
-  url_ = url;
+  prerender_manager->RecordNavigation(navigation_handle->GetURL());
 }
 
 PrerenderManager* PrerenderTabHelper::MaybeGetPrerenderManager() const {
@@ -90,7 +61,7 @@ bool PrerenderTabHelper::IsPrerendering() {
   PrerenderManager* prerender_manager = MaybeGetPrerenderManager();
   if (!prerender_manager)
     return false;
-  return prerender_manager->IsWebContentsPrerendering(web_contents(), NULL);
+  return prerender_manager->IsWebContentsPrerendering(web_contents(), nullptr);
 }
 
 void PrerenderTabHelper::PrerenderSwappedIn() {

chrome/browser/prerender/prerender_tab_helper.h

@@ -29,24 +29,14 @@ class PrerenderTabHelper
   ~PrerenderTabHelper() override;
 
   // content::WebContentsObserver implementation.
-  void DidStartNavigation(
-      content::NavigationHandle* navigation_handle) override;
-  void DidRedirectNavigation(
-      content::NavigationHandle* navigation_handle) override;
   void DidFinishNavigation(
       content::NavigationHandle* navigation_handle) override;
 
-  // Called when the URL of the main frame changed, either when the load
-  // commits, or a redirect happens.
-  void MainFrameUrlDidChange(const GURL& url);
-
   // Called when this prerendered WebContents has just been swapped in.
   void PrerenderSwappedIn();
 
   base::TimeTicks swap_ticks() const { return swap_ticks_; }
 
-  Origin origin() const { return origin_; }
-
  private:
   explicit PrerenderTabHelper(content::WebContents* web_contents);
   friend class content::WebContentsUserData<PrerenderTabHelper>;
@@ -62,18 +52,9 @@ class PrerenderTabHelper
   // Returns whether the WebContents being observed is currently prerendering.
   bool IsPrerendering();
 
-  // The origin of the relevant prerender or ORIGIN_NONE if there is no
-  // prerender associated with the WebContents.
-  Origin origin_;
-
   // Record the most recent swap time.
   base::TimeTicks swap_ticks_;
 
-  // Current URL being loaded.
-  GURL url_;
-
-  base::WeakPtrFactory<PrerenderTabHelper> weak_factory_{this};
-
   WEB_CONTENTS_USER_DATA_KEY_DECL();
 
   DISALLOW_COPY_AND_ASSIGN(PrerenderTabHelper);