Reload Instant NTP and Instant-process tabs on search url change

chrome/browser/ui/search/instant_extended_manual_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 "base/strings/string_util.h"
 #include "chrome/browser/chrome_notification_types.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/task_manager/task_manager.h"
@@ skipping 80 matching lines @@
   scoped_ptr<net::ScopedDefaultHostResolverProc> scoped_host_resolver_proc_;
   scoped_ptr<net::NetworkChangeNotifier::DisableForTest>
       disable_network_change_notifier_;
 };
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest, MANUAL_ShowsGoogleNTP) {
   set_browser(browser());
   InstantService* instant_service =
       InstantServiceFactory::GetForProfile(browser()->profile());
   ASSERT_NE(static_cast<InstantService*>(NULL), instant_service);
-  instant_service->ntp_prerenderer()->ReloadStaleNTP();
+  instant_service->ntp_prerenderer()->ReloadInstantNTP();
 
   FocusOmniboxAndWaitForInstantNTPSupport();
   content::WindowedNotificationObserver observer(
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::NotificationService::AllSources());
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL(chrome::kChromeUINewTabURL),
       CURRENT_TAB,
       ui_test_utils::BROWSER_TEST_NONE);
   observer.Wait();
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_TRUE(IsGooglePage(active_tab));
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest, MANUAL_SearchesFromFakebox) {
   set_browser(browser());
   InstantService* instant_service =
       InstantServiceFactory::GetForProfile(browser()->profile());
   ASSERT_NE(static_cast<InstantService*>(NULL), instant_service);
-  instant_service->ntp_prerenderer()->ReloadStaleNTP();
+  instant_service->ntp_prerenderer()->ReloadInstantNTP();
 
   FocusOmniboxAndWaitForInstantNTPSupport();
   // Open a new tab page.
   content::WindowedNotificationObserver observer(
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::NotificationService::AllSources());
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL(chrome::kChromeUINewTabURL),
       CURRENT_TAB,
@@ skipping 30 matching lines @@
   // The omnibox should say "test" and have visible focus.
   EXPECT_EQ("test", GetOmniboxText());
   EXPECT_EQ(OMNIBOX_FOCUS_VISIBLE, omnibox()->model()->focus_state());
 
   // Pressing enter should search for [test].
   const string16& search_title = ASCIIToUTF16("test - Google Search");
   content::TitleWatcher title_watcher(active_tab, search_title);
   PressEnterAndWaitForNavigation();
   EXPECT_EQ(search_title, title_watcher.WaitAndGetTitle());
 }