InstantExtended: don't preload the local NTP.

chrome/browser/ui/search/instant_extended_browsertest.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/prefs/pref_service.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
@@ skipping 1457 matching lines @@
   EXPECT_TRUE(UpdateSearchState(overlay));
   EXPECT_EQ(0, on_native_suggestions_calls_);
 
   SetOmniboxTextAndWaitForOverlayToShow("railroad");
 
   EXPECT_EQ(overlay, instant()->GetOverlayContents());
   EXPECT_TRUE(UpdateSearchState(overlay));
   EXPECT_EQ(1, on_native_suggestions_calls_);
 }
 
-// Test that the local NTP doesn't end up with the local overlay's URL.
-IN_PROC_BROWSER_TEST_F(InstantExtendedTest, LocalNTPIsNotLocalOverlay) {
+// Test that the local NTP is not preloaded.
+IN_PROC_BROWSER_TEST_F(InstantExtendedTest, LocalNTPIsNotPreloaded) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
 
   EXPECT_EQ(instant_url(), instant()->ntp_->contents()->GetURL());
 
-  // The second argument says to use only the local overlay.
+  // The second argument says to use only the local overlay and NTP.
   instant()->SetInstantEnabled(false, true);
 
-  EXPECT_EQ(GURL(chrome::kChromeSearchLocalNtpUrl),
-            instant()->ntp_->contents()->GetURL());
+  ASSERT_EQ(NULL, instant()->ntp());
 }
 
 // Verify top bars visibility when searching on |DEFAULT| pages and switching
 // between tabs.  Only implemented in Views and Mac currently.
 #if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MACOSX)
 #define MAYBE_TopBarsVisibilityWhenSwitchingTabs \
     TopBarsVisibilityWhenSwitchingTabs
 #else
 #define MAYBE_TopBarsVisibilityWhenSwitchingTabs \
     DISABLED_TopBarsVisibilityWhenSwitchingTabs
@@ skipping 229 matching lines @@
   SendEscape();
   EXPECT_TRUE(GetStringFromJS(contents, "chrome.embeddedSearch.searchBox.value",
                               &query));
   EXPECT_EQ("", query);
   EXPECT_EQ("", GetOmniboxText());
 
   EXPECT_TRUE(UpdateSearchState(contents));
   EXPECT_LT(0, on_change_calls_);
   EXPECT_EQ(0, submit_count_);
 }