Merge InstantPage into InstantTab.

chrome/browser/ui/search/instant_controller.cc

Index: chrome/browser/ui/search/instant_controller.cc
diff --git a/chrome/browser/ui/search/instant_controller.cc b/chrome/browser/ui/search/instant_controller.cc
index 607a29c2fda6129d3cb75f6ab1cda4442ec156c8..20457259d6a51a6c31b110b6ee0f94a224215d9c 100644
--- a/chrome/browser/ui/search/instant_controller.cc
+++ b/chrome/browser/ui/search/instant_controller.cc
@@ -31,7 +31,7 @@
 
 namespace {
 
-bool IsContentsFrom(const InstantPage* page,
+bool IsContentsFrom(const InstantTab* page,
                     const content::WebContents* contents) {
   return page && (page->web_contents() == contents);
 }
@@ -124,8 +124,8 @@ InstantTab* InstantController::instant_tab() const {
 
 void InstantController::InstantSupportChanged(
     InstantSupportState instant_support) {
-  // Handle INSTANT_SUPPORT_YES here because InstantPage is not hooked up to the
-  // active tab. Search model changed listener in InstantPage will handle other
+  // Handle INSTANT_SUPPORT_YES here because InstantTab is not hooked up to the
+  // active tab. Search model changed listener in InstantTab will handle other
   // cases.
   if (instant_support != INSTANT_SUPPORT_YES)
     return;
@@ -148,7 +148,7 @@ void InstantController::InstantSupportDetermined(
       content::NotificationService::NoDetails());
 }
 
-void InstantController::InstantPageAboutToNavigateMainFrame(
+void InstantController::InstantTabAboutToNavigateMainFrame(
     const content::WebContents* contents,
     const GURL& url) {
   DCHECK(IsContentsFrom(instant_tab(), contents));