Revert 244407 "InstantExtended: remove dead code related to the ..."

trunk/src/chrome/browser/ui/search/search_tab_helper.cc

Index: trunk/src/chrome/browser/ui/search/search_tab_helper.cc
===================================================================
--- trunk/src/chrome/browser/ui/search/search_tab_helper.cc	(revision 244428)
+++ trunk/src/chrome/browser/ui/search/search_tab_helper.cc	(working copy)
@@ -70,7 +70,8 @@
 bool IsCacheableNTP(const content::WebContents* contents) {
   const content::NavigationEntry* entry =
       contents->GetController().GetLastCommittedEntry();
-  return chrome::NavEntryIsInstantNTP(contents, entry) &&
+  return chrome::ShouldUseCacheableNTP() &&
+      chrome::NavEntryIsInstantNTP(contents, entry) &&
       entry->GetURL() != GURL(chrome::kChromeSearchLocalNtpUrl);
 }
 
@@ -294,6 +295,7 @@
   // navigation so it shouldn't be redirected.
   if (is_main_frame &&
       error_code != net::ERR_ABORTED &&
+      chrome::ShouldUseCacheableNTP() &&
       validated_url != GURL(chrome::kChromeSearchLocalNtpUrl) &&
       chrome::IsNTPURL(validated_url, profile())) {
     RedirectToLocalNTP();