Remove PrerenderLocalPredictor, part 1.

chrome/browser/ui/browser_navigator.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/ui/browser_navigator.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
-#include "chrome/browser/prerender/prerender_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_instant_controller.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/location_bar/location_bar.h"
 #include "chrome/browser/ui/search/instant_search_prerenderer.h"
 #include "chrome/browser/ui/singleton_tabs.h"
@@ skipping 603 matching lines @@
       params->target_contents->UserGestureDone();
 
     if (!swapped_in_prerender) {
       // Try to handle non-navigational URLs that popup dialogs and such, these
       // should not actually navigate.
       if (!HandleNonNavigationAboutURL(params->url)) {
         // Perform the actual navigation, tracking whether it came from the
         // renderer.
 
         LoadURLInContents(params->target_contents, params->url, params);
-        // For prerender bookkeeping purposes, record that this pending navigate
-        // originated from chrome::Navigate.
-        content::NavigationEntry* entry =
-            params->target_contents->GetController().GetPendingEntry();
-        if (entry)
-          entry->SetExtraData(prerender::kChromeNavigateExtraDataKey,
-                              base::string16());
       }
     }
   } else {
     // |target_contents| was specified non-NULL, and so we assume it has already
     // been navigated appropriately. We need to do nothing more other than
     // add it to the appropriate tabstrip.
   }
 
   // If the user navigated from the omnibox, and the selected tab is going to
   // lose focus, then make sure the focus for the source tab goes away from the
@@ skipping 29 matching lines @@
 
   if (singleton_index >= 0) {
     WebContents* target =
         params->browser->tab_strip_model()->GetWebContentsAt(singleton_index);
 
     if (target->IsCrashed()) {
       target->GetController().Reload(true);
     } else if (params->path_behavior == NavigateParams::IGNORE_AND_NAVIGATE &&
         target->GetURL() != params->url) {
       LoadURLInContents(target, params->url, params);
-      // For prerender bookkeeping purposes, record that this pending navigate
-      // originated from chrome::Navigate.
-      content::NavigationEntry* entry =
-          target->GetController().GetPendingEntry();
-      if (entry)
-        entry->SetExtraData(prerender::kChromeNavigateExtraDataKey,
-                            base::string16());
     }
 
     // If the singleton tab isn't already selected, select it.
     if (params->source_contents != params->target_contents) {
       params->browser->tab_strip_model()->ActivateTabAt(singleton_index,
                                                         user_initiated);
     }
   }
 
   if (params->disposition != CURRENT_TAB) {
@@ skipping 51 matching lines @@
   bool reverse_on_redirect = false;
   content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary(
       &rewritten_url, browser_context, &reverse_on_redirect);
 
   // Some URLs are mapped to uber subpages. Do not allow them in incognito.
   return !(rewritten_url.scheme() == content::kChromeUIScheme &&
            rewritten_url.host() == chrome::kChromeUIUberHost);
 }
 
 }  // namespace chrome