Revert 204709 "Move instant support to SearchTabHelper."

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 204944)
+++ trunk/src/chrome/browser/ui/search/search_tab_helper.cc	(working copy)
@@ -4,14 +4,12 @@
 
 #include "chrome/browser/ui/search/search_tab_helper.h"
 
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
-#include "content/public/browser/web_contents.h"
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(SearchTabHelper);
 
@@ -32,14 +30,6 @@
   return !chrome::GetSearchTerms(contents).empty();
 }
 
-// TODO(kmadhusu): Move this helper from anonymous namespace to chrome
-// namespace and remove InstantPage::IsLocal().
-bool IsLocal(const content::WebContents* contents) {
-  return contents &&
-      (contents->GetURL() == GURL(chrome::kChromeSearchLocalNtpUrl) ||
-       contents->GetURL() == GURL(chrome::kChromeSearchLocalGoogleNtpUrl));
-}
-
 }  // namespace
 
 SearchTabHelper::SearchTabHelper(content::WebContents* web_contents)
@@ -85,13 +75,6 @@
   UpdateMode();
 }
 
-void SearchTabHelper::InstantSupportChanged(bool supports_instant) {
-  if (!is_search_enabled_)
-    return;
-
-  model_.SetSupportsInstant(supports_instant);
-}
-
 void SearchTabHelper::Observe(
     int type,
     const content::NotificationSource& source,
@@ -107,22 +90,11 @@
                         OnSearchBoxShowBars)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_SearchBoxHideBars,
                         OnSearchBoxHideBars)
-    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_InstantSupportDetermined,
-                        OnInstantSupportDetermined)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
-void SearchTabHelper::DidFinishLoad(
-    int64 /* frame_id */,
-    const GURL& /* validated_url */,
-    bool is_main_frame,
-    content::RenderViewHost* /* render_view_host */) {
-  if (is_main_frame)
-    DetermineIfPageSupportsInstant();
-}
-
 void SearchTabHelper::UpdateMode() {
   SearchMode::Type type = SearchMode::MODE_DEFAULT;
   SearchMode::Origin origin = SearchMode::ORIGIN_DEFAULT;
@@ -145,33 +117,12 @@
     // OmniboxEditModel::SetInputInProgress() which is called from
     // OmniboxEditModel::Revert().
     model_.SetState(SearchModel::State(SearchMode(type, origin),
-                                       model_.state().top_bars_visible,
-                                       model_.instant_support()));
+                                       model_.state().top_bars_visible));
   } else {
     model_.SetMode(SearchMode(type, origin));
   }
 }
 
-void SearchTabHelper::DetermineIfPageSupportsInstant() {
-  Profile* profile =
-      Profile::FromBrowserContext(web_contents_->GetBrowserContext());
-  if (!chrome::ShouldAssignURLToInstantRenderer(web_contents_->GetURL(),
-                                                profile)) {
-    InstantSupportChanged(false);
-  } else if (IsLocal(web_contents_)) {
-    // Local pages always support Instant.
-    InstantSupportChanged(true);
-  } else {
-    Send(new ChromeViewMsg_DetermineIfPageSupportsInstant(routing_id()));
-  }
-}
-
-void SearchTabHelper::OnInstantSupportDetermined(int page_id,
-                                                 bool supports_instant) {
-  if (web_contents()->IsActiveEntry(page_id))
-    InstantSupportChanged(supports_instant);
-}
-
 void SearchTabHelper::OnSearchBoxShowBars(int page_id) {
   if (web_contents()->IsActiveEntry(page_id))
     model_.SetTopBarsVisible(true);
Property changes on: trunk/src/chrome/browser/ui/search/search_tab_helper.cc
___________________________________________________________________
Deleted: svn:mergeinfo