Merge InstantTag into InstantPage.

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..458f33106a15bc7db0812d9c0d26877d0d5988b5 100644
--- a/chrome/browser/ui/search/instant_controller.cc
+++ b/chrome/browser/ui/search/instant_controller.cc
@@ -16,7 +16,7 @@
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/browser_instant_controller.h"
-#include "chrome/browser/ui/search/instant_tab.h"
+#include "chrome/browser/ui/search/instant_page.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "components/sessions/core/serialized_navigation_entry.h"
 #include "content/public/browser/navigation_controller.h"
@@ -118,7 +118,7 @@ Profile* InstantController::profile() const {
   return browser_->profile();
 }
 
-InstantTab* InstantController::instant_tab() const {
+InstantPage* InstantController::instant_tab() const {
   return instant_tab_.get();
 }
 
@@ -162,7 +162,7 @@ void InstantController::ResetInstantTab() {
   if (!search_mode_.is_origin_default()) {
     content::WebContents* active_tab = browser_->GetActiveWebContents();
     if (!instant_tab_ || active_tab != instant_tab_->web_contents()) {
-      instant_tab_.reset(new InstantTab(this));
+      instant_tab_.reset(new InstantPage(this));
       instant_tab_->Init(active_tab);
       UpdateInfoForInstantTab();
     }