Change multi-prerender API to include per launcher slots.

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 122 matching lines @@
 }
 
 void AutocompleteActionPredictor::ClearTransitionalMatches() {
   transitional_matches_.clear();
 }
 
 void AutocompleteActionPredictor::StartPrerendering(
     const GURL& url,
     const content::SessionStorageNamespaceMap& session_storage_namespace_map,
     const gfx::Size& size) {
-  if (prerender_handle_.get())
-    prerender_handle_->OnNavigateAway();
+  if (prerender_handle_)
+    prerender_handle_->OnCancel();
   if (prerender::PrerenderManager* prerender_manager =
           prerender::PrerenderManagerFactory::GetForProfile(profile_)) {
     content::SessionStorageNamespace* session_storage_namespace = NULL;
     content::SessionStorageNamespaceMap::const_iterator it =
         session_storage_namespace_map.find("");
     if (it != session_storage_namespace_map.end())
       session_storage_namespace = it->second;
     prerender_handle_.reset(
         prerender_manager->AddPrerenderFromOmnibox(
             url, session_storage_namespace, size));
@@ skipping 420 matching lines @@
   return number_of_hits / (number_of_hits + value.number_of_misses);
 }
 
 AutocompleteActionPredictor::TransitionalMatch::TransitionalMatch() {
 }
 
 AutocompleteActionPredictor::TransitionalMatch::~TransitionalMatch() {
 }
 
 }  // namespace predictors