(Try 2) InstantExtended: remove dead code related to the non-cacheable NTP.

chrome/browser/ui/browser_instant_controller.cc

 // Copyright 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_instant_controller.h"
 
 #include "base/bind.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
-#include "chrome/browser/ui/search/instant_ntp.h"
 #include "chrome/browser/ui/search/instant_search_prerenderer.h"
 #include "chrome/browser/ui/search/search_model.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 
 using base::UserMetricsAction;
 
 namespace {
 
 InstantSearchPrerenderer* GetInstantSearchPrerenderer(Profile* profile) {
   DCHECK(profile);
   InstantService* instant_service =
       InstantServiceFactory::GetForProfile(profile);
   return instant_service ? instant_service->instant_search_prerenderer() : NULL;
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserInstantController, public:
 
 BrowserInstantController::BrowserInstantController(Browser* browser)
     : browser_(browser),
-      instant_(this),
-      instant_unload_handler_(browser) {
+      instant_(this) {
   browser_->search_model()->AddObserver(this);
 
   InstantService* instant_service =
       InstantServiceFactory::GetForProfile(profile());
-  instant_service->OnBrowserInstantControllerCreated();
   instant_service->AddObserver(this);
 }
 
 BrowserInstantController::~BrowserInstantController() {
   browser_->search_model()->RemoveObserver(this);
 
   InstantService* instant_service =
       InstantServiceFactory::GetForProfile(profile());
   instant_service->RemoveObserver(this);
-  instant_service->OnBrowserInstantControllerDestroyed();
-}
-
-bool BrowserInstantController::MaybeSwapInInstantNTPContents(
-    const GURL& url,
-    content::WebContents* source_contents,
-    content::WebContents** target_contents) {
-  if (url != GURL(chrome::kChromeUINewTabURL))
-    return false;
-
-  GURL extension_url(url);
-  if (ExtensionWebUI::HandleChromeURLOverride(&extension_url, profile())) {
-    // If there is an extension overriding the NTP do not use the Instant NTP.
-    return false;
-  }
-
-  InstantService* instant_service =
-      InstantServiceFactory::GetForProfile(profile());
-  scoped_ptr<content::WebContents> instant_ntp =
-      instant_service->ReleaseNTPContents();
-  if (!instant_ntp)
-    return false;
-
-  *target_contents = instant_ntp.get();
-  if (source_contents) {
-    // If the Instant NTP hasn't yet committed an entry, we can't call
-    // CopyStateFromAndPrune.  Instead, load the Local NTP URL directly in the
-    // source contents.
-    // TODO(sreeram): Always using the local URL is wrong in the case of the
-    // first tab in a window where we might want to use the remote URL. Fix.
-    if (!instant_ntp->GetController().CanPruneAllButLastCommitted()) {
-      source_contents->GetController().LoadURL(chrome::GetLocalInstantURL(
-          profile()), content::Referrer(), content::PAGE_TRANSITION_GENERATED,
-          std::string());
-      *target_contents = source_contents;
-    } else {
-      instant_ntp->GetController().CopyStateFromAndPrune(
-          &source_contents->GetController(), false);
-      ReplaceWebContentsAt(
-          browser_->tab_strip_model()->GetIndexOfWebContents(source_contents),
-          instant_ntp.Pass());
-    }
-  } else {
-    // If the Instant NTP hasn't yet committed an entry, we can't call
-    // PruneAllButLastCommitted.  In that case, there shouldn't be any entries
-    // to prune anyway.
-    if (instant_ntp->GetController().CanPruneAllButLastCommitted())
-      instant_ntp->GetController().PruneAllButLastCommitted();
-    else
-      CHECK(!instant_ntp->GetController().GetLastCommittedEntry());
-
-    // If |source_contents| is NULL, then the caller is responsible for
-    // inserting instant_ntp into the tabstrip and will take ownership.
-    ignore_result(instant_ntp.release());
-  }
-  return true;
 }
 
 bool BrowserInstantController::OpenInstant(WindowOpenDisposition disposition,
                                            const GURL& url) {
   // Unsupported dispositions.
   if (disposition == NEW_BACKGROUND_TAB || disposition == NEW_WINDOW ||
       disposition == NEW_FOREGROUND_TAB)
     return false;
 
   // The omnibox currently doesn't use other dispositions, so we don't attempt
@@ skipping 18 matching lines @@
     return false;
   }
 
   return instant_.SubmitQuery(search_terms);
 }
 
 Profile* BrowserInstantController::profile() const {
   return browser_->profile();
 }
 
-void BrowserInstantController::ReplaceWebContentsAt(
-    int index,
-    scoped_ptr<content::WebContents> new_contents) {
-  DCHECK_NE(TabStripModel::kNoTab, index);
-  scoped_ptr<content::WebContents> old_contents(browser_->tab_strip_model()->
-      ReplaceWebContentsAt(index, new_contents.release()));
-  instant_unload_handler_.RunUnloadListenersOrDestroy(old_contents.Pass(),
-                                                      index);
-}
-
 content::WebContents* BrowserInstantController::GetActiveWebContents() const {
   return browser_->tab_strip_model()->GetActiveWebContents();
 }
 
 void BrowserInstantController::ActiveTabChanged() {
   instant_.ActiveTabChanged();
 }
 
 void BrowserInstantController::TabDeactivated(content::WebContents* contents) {
   instant_.TabDeactivated(contents);
@@ skipping 60 matching lines @@
     content::RenderProcessHost* rph = contents->GetRenderProcessHost();
     instant_service->SendSearchURLsToRenderer(rph);
 
     // Reload the contents to ensure that it gets assigned to a non-priviledged
     // renderer.
     if (!instant_service->IsInstantProcess(rph->GetID()))
       continue;
     contents->GetController().Reload(false);
   }
 }