Make PrerenderHandle an observer of PrerenderContents.

chrome/browser/predictors/autocomplete_action_predictor.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/predictors/autocomplete_action_predictor.h"
 
 #include <math.h>
 
 #include <vector>
 
@@ skipping 82 matching lines @@
                                 content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
                                 content::NotificationService::AllSources());
   }
 }
 
 AutocompleteActionPredictor::~AutocompleteActionPredictor() {
   if (main_profile_predictor_)
     main_profile_predictor_->incognito_predictor_ = NULL;
   else if (incognito_predictor_)
     incognito_predictor_->main_profile_predictor_ = NULL;
-  if (prerender_handle_.get())
-    prerender_handle_->OnCancel();
+  prerender_handle_.reset();

[mmenke, 2012/12/13 18:27:16]

Since it automatically is cancelled on destruction, and we aren't observing the
handle, can we just delete this line?

[gavinp, 2012/12/13 20:45:34]

I had to remove that auto delete on destruction behaviour so that we'd be less
leaky in the link manager on channel close... Whoops. That will be in the next
upload of the events CL.

 }
 
 void AutocompleteActionPredictor::RegisterTransitionalMatches(
     const string16& user_text,
     const AutocompleteResult& result) {
   if (user_text.length() < kMinimumUserTextLength)
     return;
   const string16 lower_user_text(base::i18n::ToLower(user_text));
 
   // Merge this in to an existing match if we already saw |user_text|
@@ skipping 460 matching lines @@
   return number_of_hits / (number_of_hits + value.number_of_misses);
 }
 
 AutocompleteActionPredictor::TransitionalMatch::TransitionalMatch() {
 }
 
 AutocompleteActionPredictor::TransitionalMatch::~TransitionalMatch() {
 }
 
 }  // namespace predictors