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

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/histogram_base.h"
 #include "base/metrics/histogram_samples.h"
 #include "base/metrics/statistics_recorder.h"
@@ skipping 28 matching lines @@
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/browser/task_manager/task_manager_browsertest_util.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
-#include "chrome/browser/ui/search/instant_ntp.h"
-#include "chrome/browser/ui/search/instant_ntp_prerenderer.h"
 #include "chrome/browser/ui/search/instant_tab.h"
 #include "chrome/browser/ui/search/instant_test_utils.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/theme_source.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/instant_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/common/url_constants.h"
@@ skipping 85 matching lines @@
         on_focus_changed_calls_(0),
         is_focused_(false),
         on_toggle_voice_search_calls_(0) {
   }
  protected:
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     chrome::EnableQueryExtractionForTesting();
     ASSERT_TRUE(https_test_server().Start());
     GURL instant_url = https_test_server().GetURL(
         "files/instant_extended.html?strk=1&");
-    InstantTestBase::Init(instant_url, false);
+    GURL ntp_url = https_test_server().GetURL(
+        "files/instant_extended_ntp.html?strk=1&");
+    InstantTestBase::Init(instant_url, ntp_url, false);
   }
 
   int64 GetHistogramCount(const char* name) {
     base::HistogramBase* histogram =
         base::StatisticsRecorder::FindHistogram(name);
     if (!histogram) {
       // If no histogram is found, it's possible that no values have been
       // recorded yet. Assume that the value is zero.
       return 0;
     }
     return histogram->SnapshotSamples()->TotalCount();
   }
 
-  void SendDownArrow() {
-    omnibox()->model()->OnUpOrDownKeyPressed(1);
-    // Wait for JavaScript to run the key handler by executing a blank script.
-    EXPECT_TRUE(ExecuteScript(std::string()));
-  }
-
-  void SendUpArrow() {
-    omnibox()->model()->OnUpOrDownKeyPressed(-1);
-    // Wait for JavaScript to run the key handler by executing a blank script.
-    EXPECT_TRUE(ExecuteScript(std::string()));
-  }
-
-  void SendEscape() {
-    omnibox()->model()->OnEscapeKeyPressed();
-    // Wait for JavaScript to run the key handler by executing a blank script.
-    EXPECT_TRUE(ExecuteScript(std::string()));
-  }
-
   bool UpdateSearchState(content::WebContents* contents) WARN_UNUSED_RESULT {
     return GetIntFromJS(contents, "onMostVisitedChangedCalls",
                         &on_most_visited_change_calls_) &&
            GetIntFromJS(contents, "mostVisitedItemsCount",
                         &most_visited_items_count_) &&
            GetIntFromJS(contents, "firstMostVisitedItemId",
                         &first_most_visited_item_id_) &&
            GetIntFromJS(contents, "onNativeSuggestionsCalls",
                         &on_native_suggestions_calls_) &&
            GetIntFromJS(contents, "onChangeCalls",
@@ skipping 74 matching lines @@
   InstantExtendedPrefetchTest()
       : factory_(new net::URLFetcherImplFactory()),
         fake_factory_(new net::FakeURLFetcherFactory(factory_.get())) {
   }
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     chrome::EnableQueryExtractionForTesting();
     ASSERT_TRUE(https_test_server().Start());
     GURL instant_url = https_test_server().GetURL(
         "files/instant_extended.html?strk=1&");
-    InstantTestBase::Init(instant_url, true);
+    GURL ntp_url = https_test_server().GetURL(
+        "files/instant_extended_ntp.html?strk=1&");
+    InstantTestBase::Init(instant_url, ntp_url, true);
   }
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitchASCII(
         switches::kForceFieldTrials,
-        "EmbeddedSearch/Group11 prefetch_results_srp:1 use_cacheable_ntp:0/");
+        "EmbeddedSearch/Group11 prefetch_results_srp:1/");
   }
 
   net::FakeURLFetcherFactory* fake_factory() { return fake_factory_.get(); }
 
  private:
   // Used to instantiate FakeURLFetcherFactory.
   scoped_ptr<net::URLFetcherImplFactory> factory_;
 
   // Used to mock default search provider suggest response.
   scoped_ptr<net::FakeURLFetcherFactory> fake_factory_;
@@ skipping 29 matching lines @@
 // loads a theme that provides a background image.
 class InstantPolicyTest : public ExtensionBrowserTest, public InstantTestBase {
  public:
   InstantPolicyTest() {}
 
  protected:
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     ASSERT_TRUE(https_test_server().Start());
     GURL instant_url = https_test_server().GetURL(
         "files/instant_extended.html?strk=1&");
-    InstantTestBase::Init(instant_url, false);
+    GURL ntp_url = https_test_server().GetURL(
+        "files/instant_extended_ntp.html?strk=1&");
+    InstantTestBase::Init(instant_url, ntp_url, false);
   }
 
   void InstallThemeSource() {
     ThemeSource* theme = new ThemeSource(profile());
     content::URLDataSource::Add(profile(), theme);
   }
 
   void InstallThemeAndVerify(const std::string& theme_dir,
                              const std::string& theme_name) {
     const extensions::Extension* theme =
@@ skipping 10 matching lines @@
         ThemeServiceFactory::GetThemeForProfile(
             ExtensionBrowserTest::browser()->profile());
     ASSERT_NE(static_cast<extensions::Extension*>(NULL), new_theme);
     ASSERT_EQ(new_theme->name(), theme_name);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(InstantPolicyTest);
 };
 
-IN_PROC_BROWSER_TEST_F(InstantExtendedNetworkTest, NTPReactsToNetworkChanges) {
-  // Setup Instant.
-  ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantNTPSupport();
-
-  InstantService* instant_service =
-      InstantServiceFactory::GetForProfile(browser()->profile());
-  ASSERT_NE(static_cast<InstantService*>(NULL), instant_service);
-
-  // The setup first initializes the platform specific NetworkChangeNotifier.
-  // The InstantExtendedNetworkTest replaces it with a fake, but by the time,
-  // InstantNTPPrerenderer has already registered itself. So the
-  // InstantNTPPrerenderer needs to register itself as NetworkChangeObserver
-  // again.
-  net::NetworkChangeNotifier::AddNetworkChangeObserver(
-      instant_service->ntp_prerenderer());
-
-  // The fake network change notifier will provide the network state to be
-  // offline, so the ntp will be local.
-  ASSERT_NE(static_cast<InstantNTP*>(NULL),
-            instant_service->ntp_prerenderer()->ntp());
-  EXPECT_TRUE(instant_service->ntp_prerenderer()->ntp()->IsLocal());
-
-  // Change the connect state, and wait for the notifications to be run, and NTP
-  // support to be determined.
-  SetConnectionType(net::NetworkChangeNotifier::CONNECTION_ETHERNET);
-  FocusOmniboxAndWaitForInstantNTPSupport();
-
-  // Verify the network state is fine, and InstantNTPPrerenderer doesn't want
-  // to switch to local NTP anymore.
-  EXPECT_FALSE(net::NetworkChangeNotifier::IsOffline());
-  EXPECT_FALSE(instant_service->ntp_prerenderer()->ShouldSwitchToLocalNTP());
-
-  // Open new tab.
-  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();
-
-  // Verify new NTP is not local.
-  EXPECT_TRUE(chrome::IsInstantNTP(active_tab));
-  EXPECT_NE(instant_service->ntp_prerenderer()->GetLocalInstantURL(),
-            active_tab->GetURL().spec());
-  ASSERT_NE(static_cast<InstantNTP*>(NULL),
-            instant_service->ntp_prerenderer()->ntp());
-  EXPECT_FALSE(instant_service->ntp_prerenderer()->ntp()->IsLocal());
-
-  SetConnectionType(net::NetworkChangeNotifier::CONNECTION_NONE);
-  FocusOmniboxAndWaitForInstantNTPSupport();
-
-  // Verify the network state is fine, and InstantNTPPrerenderer doesn't want
-  // to switch to local NTP anymore.
-  EXPECT_TRUE(net::NetworkChangeNotifier::IsOffline());
-  EXPECT_TRUE(instant_service->ntp_prerenderer()->ShouldSwitchToLocalNTP());
-
-  // Open new tab. Preloaded NTP contents should have been used.
-  ui_test_utils::NavigateToURLWithDisposition(
-      browser(),
-      GURL(chrome::kChromeUINewTabURL),
-      NEW_FOREGROUND_TAB,
-      ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
-  active_tab = browser()->tab_strip_model()->GetActiveWebContents();
-
-  // Verify new NTP is not local.
-  EXPECT_TRUE(chrome::IsInstantNTP(active_tab));
-  EXPECT_EQ(instant_service->ntp_prerenderer()->GetLocalInstantURL(),
-            active_tab->GetURL().spec());
-  ASSERT_NE(static_cast<InstantNTP*>(NULL),
-            instant_service->ntp_prerenderer()->ntp());
-  EXPECT_TRUE(instant_service->ntp_prerenderer()->ntp()->IsLocal());
-}
-
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, SearchReusesInstantTab) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantNTPSupport();
+  FocusOmnibox();
 
   content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,
       content::NotificationService::AllSources());
   SetOmniboxText("flowers");
   PressEnterAndWaitForNavigation();
   observer.Wait();
 
   // Just did a regular search.
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_THAT(active_tab->GetURL().spec(), HasSubstr("q=flowers"));
   ASSERT_TRUE(UpdateSearchState(active_tab));
   ASSERT_EQ(0, submit_count_);
 
   SetOmniboxText("puppies");
   PressEnterAndWaitForNavigation();
 
   // Should have reused the tab and sent an onsubmit message.
   active_tab = browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_THAT(active_tab->GetURL().spec(), HasSubstr("q=puppies"));
   ASSERT_TRUE(UpdateSearchState(active_tab));
   EXPECT_EQ(1, submit_count_);
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
                        SearchDoesntReuseInstantTabWithoutSupport) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantNTPSupport();
+  FocusOmnibox();
 
   // Don't wait for the navigation to complete.
   SetOmniboxText("flowers");
   browser()->window()->GetLocationBar()->AcceptInput();
 
   SetOmniboxText("puppies");
   browser()->window()->GetLocationBar()->AcceptInput();
 
   // Should not have reused the tab.
   ASSERT_THAT(
       browser()->tab_strip_model()->GetActiveWebContents()->GetURL().spec(),
       HasSubstr("q=puppies"));
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
                        TypedSearchURLDoesntReuseInstantTab) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantNTPSupport();
+  FocusOmnibox();
 
   // Create an observer to wait for the instant tab to support Instant.
   content::WindowedNotificationObserver observer_1(
       chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,
       content::NotificationService::AllSources());
   SetOmniboxText("flowers");
   PressEnterAndWaitForNavigation();
   observer_1.Wait();
 
   // Just did a regular search.
@@ skipping 11 matching lines @@
   PressEnterAndWaitForNavigation();
   observer_2.Wait();
 
   // Should not have reused the tab.
   active_tab = browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_THAT(active_tab->GetURL().spec(), HasSubstr("q=puppies"));
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, OmniboxMarginSetForSearchURLs) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantNTPSupport();
+  FocusOmnibox();
 
   // Create an observer to wait for the instant tab to support Instant.
   content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,
       content::NotificationService::AllSources());
 
   SetOmniboxText("flowers");
   browser()->window()->GetLocationBar()->AcceptInput();
   observer.Wait();
 
   const std::string& url =
       browser()->tab_strip_model()->GetActiveWebContents()->GetURL().spec();
   // Make sure we actually used search_url, not instant_url.
   ASSERT_THAT(url, HasSubstr("&is_search"));
   EXPECT_THAT(url, HasSubstr("&es_sm="));
 }
 
 // Test to verify that switching tabs should not dispatch onmostvisitedchanged
 // events.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, NoMostVisitedChangedOnTabSwitch) {
   // Initialize Instant.
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantNTPSupport();
 
-  // Open new tab. Preloaded NTP contents should have been used.
+  // Open new tab.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL(chrome::kChromeUINewTabURL),
       NEW_FOREGROUND_TAB,
-      ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
+      ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB |
+      ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   EXPECT_EQ(2, browser()->tab_strip_model()->count());
 
   // Make sure new tab received the onmostvisitedchanged event once.
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_TRUE(UpdateSearchState(active_tab));
   EXPECT_EQ(1, on_most_visited_change_calls_);
 
   // Activate the previous tab.
   browser()->tab_strip_model()->ActivateTabAt(0, false);
 
   // Switch back to new tab.
   browser()->tab_strip_model()->ActivateTabAt(1, false);
 
   // Confirm that new tab got no onmostvisitedchanged event.
   active_tab = browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_TRUE(UpdateSearchState(active_tab));
   EXPECT_EQ(1, on_most_visited_change_calls_);
 }
 
 IN_PROC_BROWSER_TEST_F(InstantPolicyTest, ThemeBackgroundAccess) {
   InstallThemeSource();
   ASSERT_NO_FATAL_FAILURE(InstallThemeAndVerify("theme", "camo theme"));
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantNTPSupport();
 
   // The "Instant" New Tab should have access to chrome-search: scheme but not
   // chrome: scheme.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL(chrome::kChromeUINewTabURL),
       NEW_FOREGROUND_TAB,
-      ui_test_utils::BROWSER_TEST_NONE);
+      ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB |
+      ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
 
   content::RenderViewHost* rvh =
       browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost();
 
   const std::string chrome_url("chrome://theme/IDR_THEME_NTP_BACKGROUND");
   const std::string search_url(
       "chrome-search://theme/IDR_THEME_NTP_BACKGROUND");
   bool loaded = false;
   ASSERT_TRUE(LoadImage(rvh, chrome_url, &loaded));
   EXPECT_FALSE(loaded) << chrome_url;
   ASSERT_TRUE(LoadImage(rvh, search_url, &loaded));
   EXPECT_TRUE(loaded) << search_url;
 }
 
+// Flaky on all bots. http://crbug.com/335297.
 IN_PROC_BROWSER_TEST_F(InstantPolicyTest,
-                       NoThemeBackgroundChangeEventOnTabSwitch) {
+                       DISABLED_NoThemeBackgroundChangeEventOnTabSwitch) {
   InstallThemeSource();
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantNTPSupport();
 
   // Install a theme.
   ASSERT_NO_FATAL_FAILURE(InstallThemeAndVerify("theme", "camo theme"));
   EXPECT_EQ(1, browser()->tab_strip_model()->count());
 
-  // Open new tab. Preloaded NTP contents should have been used.
+  // Open new tab.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL(chrome::kChromeUINewTabURL),
       NEW_FOREGROUND_TAB,
-      ui_test_utils::BROWSER_TEST_NONE);
+      ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB |
+      ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   EXPECT_EQ(2, browser()->tab_strip_model()->count());
 
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_EQ(1, browser()->tab_strip_model()->active_index());
   int on_theme_changed_calls = 0;
   EXPECT_TRUE(GetIntFromJS(active_tab, "onThemeChangedCalls",
                            &on_theme_changed_calls));
   EXPECT_EQ(1, on_theme_changed_calls);
 
   // Activate the previous tab.
   browser()->tab_strip_model()->ActivateTabAt(0, false);
   ASSERT_EQ(0, browser()->tab_strip_model()->active_index());
 
   // Switch back to new tab.
   browser()->tab_strip_model()->ActivateTabAt(1, false);
   ASSERT_EQ(1, browser()->tab_strip_model()->active_index());
 
   // Confirm that new tab got no onthemechanged event while switching tabs.
   active_tab = browser()->tab_strip_model()->GetActiveWebContents();
   on_theme_changed_calls = 0;
   EXPECT_TRUE(GetIntFromJS(active_tab, "onThemeChangedCalls",
                            &on_theme_changed_calls));
   EXPECT_EQ(1, on_theme_changed_calls);
 }
 
-
-// Flaky on Linux: http://crbug.com/265971
-#if defined(OS_LINUX)
-#define MAYBE_SendThemeBackgroundChangedEvent DISABLED_SendThemeBackgroundChangedEvent
-#else
-#define MAYBE_SendThemeBackgroundChangedEvent SendThemeBackgroundChangedEvent
-#endif
+// Flaky on all bots. http://crbug.com/335297, http://crbug.com/265971.
 IN_PROC_BROWSER_TEST_F(InstantPolicyTest,
-                       MAYBE_SendThemeBackgroundChangedEvent) {
+                       DISABLED_SendThemeBackgroundChangedEvent) {
   InstallThemeSource();
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantNTPSupport();
 
   // Install a theme.
   ASSERT_NO_FATAL_FAILURE(InstallThemeAndVerify("theme", "camo theme"));
 
-  // Open new tab. Preloaded NTP contents should have been used.
+  // Open new tab.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL(chrome::kChromeUINewTabURL),
       NEW_FOREGROUND_TAB,
-      ui_test_utils::BROWSER_TEST_NONE);
+      ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB |
+      ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   EXPECT_EQ(2, browser()->tab_strip_model()->count());
 
   // Make sure new tab received an onthemechanged event.
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_EQ(1, browser()->tab_strip_model()->active_index());
   int on_theme_changed_calls = 0;
   EXPECT_TRUE(GetIntFromJS(active_tab, "onThemeChangedCalls",
                            &on_theme_changed_calls));
   EXPECT_EQ(1, on_theme_changed_calls);
@@ skipping 14 matching lines @@
 #else
 #define MAYBE_UpdateSearchQueryOnBackNavigation UpdateSearchQueryOnBackNavigation
 #endif
 // Test to verify that the omnibox search query is updated on browser
 // back button press event.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
                        MAYBE_UpdateSearchQueryOnBackNavigation) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
 
   // Focus omnibox and confirm overlay isn't shown.
-  FocusOmniboxAndWaitForInstantNTPSupport();
+  FocusOmnibox();
 
   // Create an observer to wait for the instant tab to support Instant.
   content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,
       content::NotificationService::AllSources());
 
   SetOmniboxText("flowers");
   // Commit the search by pressing 'Enter'.
   PressEnterAndWaitForNavigation();
   observer.Wait();
@@ skipping 26 matching lines @@
 }
 
 // Flaky: crbug.com/253092.
 // Test to verify that the omnibox search query is updated on browser
 // forward button press events.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
                        DISABLED_UpdateSearchQueryOnForwardNavigation) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
 
   // Focus omnibox and confirm overlay isn't shown.
-  FocusOmniboxAndWaitForInstantNTPSupport();
+  FocusOmnibox();
 
   // Create an observer to wait for the instant tab to support Instant.
   content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,
       content::NotificationService::AllSources());
 
   SetOmniboxText("flowers");
   // Commit the search by pressing 'Enter'.
   PressEnterAndWaitForNavigation();
   observer.Wait();
@@ skipping 32 matching lines @@
   // Commit the search by pressing 'Enter'.
   FocusOmnibox();
   EXPECT_EQ(ASCIIToUTF16("cattles"), omnibox()->GetText());
   PressEnterAndWaitForNavigation();
   EXPECT_EQ(ASCIIToUTF16("cattles"), omnibox()->GetText());
 }
 
 // Flaky on all bots since re-enabled in r208032, crbug.com/253092
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, DISABLED_NavigateBackToNTP) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantNTPSupport();
+  FocusOmnibox();
 
   // Open a new tab page.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL(chrome::kChromeUINewTabURL),
       NEW_FOREGROUND_TAB,
-      ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
+      ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB |
+      ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   EXPECT_EQ(2, browser()->tab_strip_model()->count());
 
   content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,
       content::NotificationService::AllSources());
   SetOmniboxText("flowers");
   PressEnterAndWaitForNavigation();
   observer.Wait();
 
   EXPECT_EQ(ASCIIToUTF16("flowers"), omnibox()->GetText());
@@ skipping 32 matching lines @@
 
   active_tab = browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_TRUE(chrome::IsInstantNTP(active_tab));
 }
 
 // Flaky: crbug.com/267119
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
                        DISABLED_DispatchMVChangeEventWhileNavigatingBackToNTP) {
   // Setup Instant.
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantNTPSupport();
+  FocusOmnibox();
 
-  // Open new tab. Preloaded NTP contents should have been used.
+  // Open new tab.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL(chrome::kChromeUINewTabURL),
       NEW_FOREGROUND_TAB,
-      ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
+      ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB |
+      ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
 
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_TRUE(UpdateSearchState(active_tab));
   EXPECT_EQ(1, on_most_visited_change_calls_);
 
   content::WindowedNotificationObserver observer(
       content::NOTIFICATION_LOAD_STOP,
       content::NotificationService::AllSources());
   // Set the text and press enter to navigate from NTP.
@@ skipping 13 matching lines @@
 
   // Verify that onmostvisitedchange event is dispatched when we navigate from
   // SRP to NTP.
   active_tab = browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_TRUE(UpdateSearchState(active_tab));
   EXPECT_EQ(1, on_most_visited_change_calls_);
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedPrefetchTest, SetPrefetchQuery) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantNTPSupport();
+  FocusOmnibox();
 
   content::WindowedNotificationObserver new_tab_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);
   new_tab_observer.Wait();
@@ skipping 39 matching lines @@
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(UpdateSearchState(active_tab));
   ASSERT_TRUE(SearchProvider::ShouldPrefetch(*(
       omnibox()->model()->result().default_match())));
   ASSERT_EQ("puppy", prefetch_query_value_);
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedPrefetchTest, ClearPrefetchedResults) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantNTPSupport();
+  FocusOmnibox();
 
   content::WindowedNotificationObserver new_tab_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);
   new_tab_observer.Wait();
@@ skipping 71 matching lines @@
   // the search terms is sufficient.
   EXPECT_NE(ASCIIToUTF16("foo"), omnibox()->GetText());
 }
 
 // Check that clicking on a result sends the correct referrer.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, Referrer) {
   ASSERT_TRUE(test_server()->Start());
   GURL result_url =
       test_server()->GetURL("files/referrer_policy/referrer-policy-log.html");
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantNTPSupport();
+  FocusOmnibox();
 
   // Type a query and press enter to get results.
   SetOmniboxText("query");
   PressEnterAndWaitForNavigation();
 
   // Simulate going to a result.
   content::WebContents* contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   std::ostringstream stream;
   stream << "var link = document.createElement('a');";
   stream << "link.href = \"" << result_url.spec() << "\";";
   stream << "document.body.appendChild(link);";
   stream << "link.click();";
   EXPECT_TRUE(content::ExecuteScript(contents, stream.str()));
 
   content::WaitForLoadStop(contents);
   std::string expected_title =
       "Referrer is " + instant_url().GetWithEmptyPath().spec();
   EXPECT_EQ(ASCIIToUTF16(expected_title), contents->GetTitle());
 }