Merge InstantTag into InstantPage.

chrome/browser/ui/search/instant_controller.h

Index: chrome/browser/ui/search/instant_controller.h
diff --git a/chrome/browser/ui/search/instant_controller.h b/chrome/browser/ui/search/instant_controller.h
index b051956a3e46bf7de5839cfcf64c93e96d68018f..2bca55bf98ad2f634bc550aa8c6ddf7c7a96afc5 100644
--- a/chrome/browser/ui/search/instant_controller.h
+++ b/chrome/browser/ui/search/instant_controller.h
@@ -20,8 +20,8 @@
 
 class BrowserInstantController;
 class GURL;
+class InstantPage;
 class InstantService;
-class InstantTab;
 class Profile;
 struct EmbeddedSearchRequestParams;
 
@@ -76,7 +76,7 @@ class InstantController : public InstantPage::Delegate {
 
  protected:
   // Accessors are made protected for testing purposes.
-  virtual InstantTab* instant_tab() const;
+  virtual InstantPage* instant_tab() const;
 
   virtual Profile* profile() const;
 
@@ -125,7 +125,7 @@ class InstantController : public InstantPage::Delegate {
   BrowserInstantController* const browser_;
 
   // The instance of InstantPage maintained by InstantController.
-  std::unique_ptr<InstantTab> instant_tab_;
+  std::unique_ptr<InstantPage> instant_tab_;
 
   // The search model mode for the active tab.
   SearchMode search_mode_;