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 866ad2c264814de888cc1d2c8aa1afaaff4f5015..613ee25798e9a96344e174a629ab96810154e458 100644 |
--- a/chrome/browser/ui/search/instant_controller.h |
+++ b/chrome/browser/ui/search/instant_controller.h |
@@ -116,18 +116,9 @@ class InstantController : public InstantPage::Delegate { |
FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ExtendedModeIsOn); |
FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, MostVisited); |
- FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, NTPIsPreloaded); |
- FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPIsUsedInNewTab); |
- FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPIsUsedInSameTab); |
- FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPForWrongProvider); |
- FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPRenderProcessGone); |
- FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, |
- PreloadedNTPDoesntSupportInstant); |
FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ProcessIsolation); |
FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, UnrelatedSiteInstance); |
FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, OnDefaultSearchProviderChanged); |
- FRIEND_TEST_ALL_PREFIXES(InstantExtendedNetworkTest, |
- NTPReactsToNetworkChanges); |
FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, |
AcceptingURLSearchDoesNotNavigate); |
FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, AcceptingJSSearchDoesNotRunJS); |
@@ -154,7 +145,6 @@ class InstantController : public InstantPage::Delegate { |
virtual void InstantPageAboutToNavigateMainFrame( |
const content::WebContents* contents, |
const GURL& url) OVERRIDE; |
- virtual void InstantPageLoadFailed(content::WebContents* contents) OVERRIDE; |
// Helper function to navigate the given contents to the local fallback |
// Instant URL and trim the history correctly. |