Instant: Don't use the local overlay's URL for the NTP.

chrome/browser/ui/search/instant_controller.h

Index: chrome/browser/ui/search/instant_controller.h
diff --git a/chrome/browser/ui/search/instant_controller.h b/chrome/browser/ui/search/instant_controller.h
index ecd333e358f85b96c270420840f3ac3f25306a08..09db21d34428b842e7ad83f6c15c34ec1cdee633 100644
--- a/chrome/browser/ui/search/instant_controller.h
+++ b/chrome/browser/ui/search/instant_controller.h
@@ -216,6 +216,7 @@ class InstantController : public InstantPage::Delegate,
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ValidatesSuggestions);
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
       OmniboxCommitsWhenShownFullHeight);
+  FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, LocalNTPIsNotLocalOverlay);
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedManualTest,
                            MANUAL_OmniboxFocusLoadsInstant);
 
@@ -312,19 +313,10 @@ class InstantController : public InstantPage::Delegate,
   // Send the omnibox popup bounds to the page.
   void SendPopupBoundsToPage();
 
-  // Determines the Instant URL based on a number of factors:
-  // If |extended_enabled_|:
-  //   - If |use_local_overlay_only_| is true return kLocalOmniboxPopupURL, else
-  //   - If the Instant URL is specified by command line, returns it, else
-  //   - If the default Instant URL is present returns it.
-  // If !|extended_enabled_|:
-  //   - If the Instant URL is specified by command line, returns it, else
-  //   - If the default Instant URL is present returns it.
-  //
-  // If |ignore_blacklist| is set to true, Instant URLs are not filtered through
-  // the blacklist.
-  //
-  // Returns true if a valid Instant URL could be found that is not blacklisted.
+  // Returns the default search engine's Instant URL (possibly overridden by
+  // the --instant-url commandline param), if it's not blacklisted already.
+  // Ignores the blacklist if |ignore_blacklist| is true. Returns true if a
+  // valid Instant URL was assigned to |instant_url|; false otherwise.
   bool GetInstantURL(Profile* profile,
                      bool ignore_blacklist,
                      std::string* instant_url) const;