Merge InstantTag into InstantPage.

chrome/browser/ui/search/instant_page.cc

Index: chrome/browser/ui/search/instant_page.cc
diff --git a/chrome/browser/ui/search/instant_page.cc b/chrome/browser/ui/search/instant_page.cc
index fce80b3f15fe7a80898d2995e7edd29348a397d0..cf48b861be5063c0fe23589297511dcdf48f618e 100644
--- a/chrome/browser/ui/search/instant_page.cc
+++ b/chrome/browser/ui/search/instant_page.cc
@@ -34,7 +34,7 @@ InstantPage::InstantPage(Delegate* delegate)
     : delegate_(delegate) {
 }
 
-void InstantPage::SetContents(content::WebContents* new_web_contents) {
+void InstantPage::Init(content::WebContents* new_web_contents) {
   ClearContents();
 
   if (!new_web_contents)
@@ -50,16 +50,11 @@ void InstantPage::SetContents(content::WebContents* new_web_contents) {
     InstantSupportDetermined(model->instant_support() == INSTANT_SUPPORT_YES);
 }
 
-bool InstantPage::ShouldProcessAboutToNavigateMainFrame() {
-  return false;
-}
-
 void InstantPage::DidCommitProvisionalLoadForFrame(
     content::RenderFrameHost* render_frame_host,
     const GURL& url,
     ui::PageTransition /* transition_type */) {
-  if (!render_frame_host->GetParent() &&
-      ShouldProcessAboutToNavigateMainFrame()) {
+  if (!render_frame_host->GetParent()) {
     delegate_->InstantPageAboutToNavigateMainFrame(web_contents(), url);
   }
 }