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

chrome/browser/ui/search/local_ntp_browsertest.cc

Index: chrome/browser/ui/search/local_ntp_browsertest.cc
diff --git a/chrome/browser/ui/search/local_ntp_browsertest.cc b/chrome/browser/ui/search/local_ntp_browsertest.cc
index bc61e5236b5ee58da4a75543ba0e79f91aba212b..1e6af866cb0ae7d7f3624dfbe681725cdf68f8ab 100644
--- a/chrome/browser/ui/search/local_ntp_browsertest.cc
+++ b/chrome/browser/ui/search/local_ntp_browsertest.cc
@@ -24,15 +24,17 @@ class LocalNTPTest : public InProcessBrowserTest,
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     ASSERT_TRUE(https_test_server().Start());
     GURL instant_url = https_test_server().GetURL(
+        "files/instant_extended.html?strk=1&");
+    GURL ntp_url = https_test_server().GetURL(
         "files/local_ntp_browsertest.html?strk=1&");
-    InstantTestBase::Init(instant_url, false);
+    InstantTestBase::Init(instant_url, ntp_url, false);
   }
 };
 
 // Flaky: crbug.com/267117
 IN_PROC_BROWSER_TEST_F(LocalNTPTest, DISABLED_LocalNTPJavascriptTest) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantNTPSupport();
+  FocusOmnibox();
 
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
@@ -65,7 +67,7 @@ IN_PROC_BROWSER_TEST_F(LocalNTPTest,
 
   // Setup Instant.
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantNTPSupport();
+  FocusOmnibox();
 
   // Open a new tab.
   ui_test_utils::NavigateToURLWithDisposition(