Remove PrerenderTracker::TryCancel* methods and associated ones, since destruction of prerender onl…

chrome/browser/prerender/prerender_contents.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/prerender/prerender_contents.h"
 
 #include <algorithm>
 #include <functional>
 #include <utility>
 
@@ skipping 648 matching lines @@
     return;
   CheckURL(details.new_url);
 }
 
 void PrerenderContents::Destroy(FinalStatus final_status) {
   DCHECK_NE(final_status, FINAL_STATUS_USED);
 
   if (prerendering_has_been_cancelled_)
     return;
 
-  if (child_id_ != -1 && route_id_ != -1) {
-    // Cancel the prerender in the PrerenderTracker.  This is needed
-    // because destroy may be called directly from the UI thread without calling
-    // TryCancel().  This is difficult to completely avoid, since prerendering
-    // can be cancelled before a RenderView is created.
-    bool is_cancelled = prerender_manager()->prerender_tracker()->TryCancel(
-        child_id_, route_id_, final_status);
-    CHECK(is_cancelled);
-
-    // A different final status may have been set already from another thread.
-    // If so, use it instead.
-    if (!prerender_manager()->prerender_tracker()->
-            GetFinalStatus(child_id_, route_id_, &final_status)) {
-      NOTREACHED();
-    }
-  }
   SetFinalStatus(final_status);
 
   prerendering_has_been_cancelled_ = true;
   prerender_manager_->AddToHistory(this);
   prerender_manager_->MoveEntryToPendingDelete(this, final_status);
 
   // Note that if this PrerenderContents was made into a MatchComplete
   // replacement by MoveEntryToPendingDelete, NotifyPrerenderStop will
   // not reach the PrerenderHandle. Rather
   // OnPrerenderCreatedMatchCompleteReplacement will propogate that
@@ skipping 91 matching lines @@
     return NULL;
   return prerender_contents()->GetController().
       GetDefaultSessionStorageNamespace();
 }
 
 void PrerenderContents::OnCancelPrerenderForPrinting() {
   Destroy(FINAL_STATUS_WINDOW_PRINT);
 }
 
 }  // namespace prerender