Replace PruneAllButActive with PruneAllButVisible.

chrome/browser/ui/search/instant_extended_interactive_uitest.cc

 // Copyright 2013 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 <sstream>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_base.h"
 #include "base/metrics/histogram_samples.h"
@@ skipping 864 matching lines @@
 
   // NTP contents should be preloaded.
   ASSERT_NE(static_cast<InstantNTP*>(NULL), instant()->ntp());
   EXPECT_FALSE(instant()->ntp()->IsLocal());
 
   // NTP not reloaded after being killed.
   instant()->InstantPageRenderViewGone(instant()->ntp()->contents());
   EXPECT_EQ(NULL, instant()->ntp());
 
   // Open new tab. Should use local NTP.
+  // TODO(creis): Same problem.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL(chrome::kChromeUINewTabURL),
       NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_EQ(instant()->GetLocalInstantURL(), active_tab->GetURL().spec());
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, PreloadedNTPDoesntSupportInstant) {
   // Setup Instant.
   GURL instant_url = test_server()->GetURL("files/empty.html?strk=1");
   InstantTestBase::Init(instant_url);
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   // NTP contents should have fallen back to the local page.
   ASSERT_NE(static_cast<InstantNTP*>(NULL), instant()->ntp());
   EXPECT_TRUE(instant()->ntp()->IsLocal());
 
   // Open new tab. Should use local NTP.
+  // TODO(creis): Same problem.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL(chrome::kChromeUINewTabURL),
       NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_EQ(instant()->GetLocalInstantURL(), active_tab->GetURL().spec());
 }
 
@@ skipping 1530 matching lines @@
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitch(switches::kEnableInstantExtendedAPI);
     command_line->AppendSwitch(switches::kDisableLocalFirstLoadNTP);
   }
 };
 
 // Flaky: http://crbug.com/238863
 IN_PROC_BROWSER_TEST_F(
     InstantExtendedFirstTabTest, DISABLED_RedirectToLocalOnLoadFailure) {
   // Create a new window to test the first NTP load.
+  // TODO(creis): This fails in BrowserInstantController's
+  // MaybeSwapInInstantNTPContents because the pending entry hasn't
+  // committed yet.  It's trying to SwapInInstantNTP as part of the OpenURL
+  // call, which can't work.  (What if the navigation were to fail?)
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL(chrome::kChromeUINewTabURL),
       NEW_WINDOW,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
 
   const BrowserList* native_browser_list = BrowserList::GetInstance(
       chrome::HOST_DESKTOP_TYPE_NATIVE);
   ASSERT_EQ(2u, native_browser_list->size());
   set_browser(native_browser_list->get(1));
@@ skipping 11 matching lines @@
   // NTP contents should be preloaded.
   ASSERT_NE(static_cast<InstantNTP*>(NULL), instant()->ntp());
   EXPECT_TRUE(instant()->ntp()->IsLocal());
 
   // Overlay contents should be preloaded.
   ASSERT_NE(static_cast<InstantOverlay*>(NULL), instant()->overlay());
   EXPECT_TRUE(instant()->overlay()->IsLocal());
 
   // Instant tab contents should be preloaded.
   ASSERT_NE(static_cast<InstantTab*>(NULL), instant()->instant_tab());
+  // TODO(creis): This is where the test fails.
   EXPECT_TRUE(instant()->instant_tab()->IsLocal());
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
                        PageVisibilityEventOnCommit) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   // Set the text, and wait for suggestions to show up.
   ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("search"));
@@ skipping 16 matching lines @@
 
 // Test that if the LogDropdownShown() call records a histogram value.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, LogDropdownShown) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
   int64 histogramValue = GetHistogramCount("Instant.TimeToFirstShowFromWeb");
   ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("a"));
   EXPECT_EQ(histogramValue + 1,
             GetHistogramCount("Instant.TimeToFirstShowFromWeb"));
 }