Renamed CanPruneAllButVisible and PruneAllButVisible in the Navigation Controller to CanPruneAllBut…

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"
@@ skipping 62 matching lines @@
   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().CanPruneAllButVisible()) {
+    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());
       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
-    // PruneAllButVisible.  In that case, there shouldn't be any entries to
-    // prune anyway.
-    if (instant_ntp->GetController().CanPruneAllButVisible())
-      instant_ntp->GetController().PruneAllButVisible();
+    // 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;
 }
 
@@ skipping 105 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);
   }
 }