Replace PruneAllButActive with PruneAllButVisible.

content/browser/web_contents/web_contents_impl_unittest.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 "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/renderer_host/frame_tree_node.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/site_instance_impl.h"
@@ skipping 1926 matching lines @@
   // Create another NavigationController.
   GURL url3("http://foo2");
   scoped_ptr<TestWebContents> other_contents(
       static_cast<TestWebContents*>(CreateTestWebContents()));
   NavigationControllerImpl& other_controller = other_contents->GetController();
   other_contents->NavigateAndCommit(url3);
   other_contents->ExpectSetHistoryLengthAndPrune(
       NavigationEntryImpl::FromNavigationEntry(
           other_controller.GetEntryAtIndex(0))->site_instance(), 1,
       other_controller.GetEntryAtIndex(0)->GetPageID());
-  other_controller.CopyStateFromAndPrune(&controller());
+  EXPECT_TRUE(other_controller.CopyStateFromAndPrune(&controller()));
 
   // The merged controller should only have two entries: url1 and url2.
   ASSERT_EQ(2, other_controller.GetEntryCount());
   EXPECT_EQ(1, other_controller.GetCurrentEntryIndex());
   EXPECT_EQ(url1, other_controller.GetEntryAtIndex(0)->GetURL());
   EXPECT_EQ(url3, other_controller.GetEntryAtIndex(1)->GetURL());
 
   // And the merged controller shouldn't be showing an interstitial.
   EXPECT_FALSE(other_contents->ShowingInterstitialPage());
 }
 
-// Makes sure that CopyStateFromAndPrune does the right thing if the object
-// CopyStateFromAndPrune is invoked on is showing an interstitial.
+// Makes sure that CopyStateFromAndPrune cannot be called if the target is
+// showing an interstitial.
 TEST_F(WebContentsImplTest, CopyStateFromAndPruneTargetInterstitial) {
   // Navigate to a page.
   GURL url1("http://www.google.com");
   contents()->NavigateAndCommit(url1);
 
   // Create another NavigationController.
   scoped_ptr<TestWebContents> other_contents(
       static_cast<TestWebContents*>(CreateTestWebContents()));
   NavigationControllerImpl& other_controller = other_contents->GetController();
 
   // Navigate it to url2.
   GURL url2("http://foo2");
   other_contents->NavigateAndCommit(url2);
 
   // Show an interstitial.
   TestInterstitialPage::InterstitialState state =
       TestInterstitialPage::INVALID;
   bool deleted = false;
   GURL url3("http://interstitial");
   TestInterstitialPage* interstitial =
       new TestInterstitialPage(other_contents.get(), true, url3, &state,
                                &deleted);
   TestInterstitialPageStateGuard state_guard(interstitial);
   interstitial->Show();
   interstitial->TestDidNavigate(1, url3);
   EXPECT_TRUE(interstitial->is_showing());
   EXPECT_EQ(2, other_controller.GetEntryCount());
-  other_contents->ExpectSetHistoryLengthAndPrune(
-      NavigationEntryImpl::FromNavigationEntry(
-          other_controller.GetEntryAtIndex(0))->site_instance(), 1,
-      other_controller.GetEntryAtIndex(0)->GetPageID());
-  other_controller.CopyStateFromAndPrune(&controller());
 
-  // The merged controller should only have two entries: url1 and url2.
-  ASSERT_EQ(2, other_controller.GetEntryCount());
-  EXPECT_EQ(1, other_controller.GetCurrentEntryIndex());
-  EXPECT_EQ(url1, other_controller.GetEntryAtIndex(0)->GetURL());
-  EXPECT_EQ(url3, other_controller.GetEntryAtIndex(1)->GetURL());
-
-  // It should have a transient entry.
-  EXPECT_TRUE(other_controller.GetTransientEntry());
-
-  // And the interstitial should be showing.
-  EXPECT_TRUE(other_contents->ShowingInterstitialPage());
-
-  // And the interstitial should do a reload on don't proceed.
-  EXPECT_TRUE(static_cast<InterstitialPageImpl*>(
-      other_contents->GetInterstitialPage())->reload_on_dont_proceed());
+  // Ensure that we do not allow calling CopyStateFromAndPrune when an
+  // interstitial is showing in the target.
+  EXPECT_FALSE(other_controller.CanPruneAllButVisible());
 }
 
 // Regression test for http://crbug.com/168611 - the URLs passed by the
 // DidFinishLoad and DidFailLoadWithError IPCs should get filtered.
 TEST_F(WebContentsImplTest, FilterURLs) {
   TestWebContentsObserver observer(contents());
 
   // A navigation to about:whatever should always look like a navigation to
   // about:blank
   GURL url_normalized("about:blank");
@@ skipping 104 matching lines @@
   EXPECT_EQ(0UL, deep_tree->child_at(0)->child_at(0)->child_count());
 
   contents()->OnFrameDetached(16, 265);
   EXPECT_EQ(4UL, root->child_at(2)->child_count());
 
   contents()->OnFrameDetached(5, 15);
   EXPECT_EQ(2UL, root->child_count());
 }
 
 }  // namespace content