Merge InstantTag into InstantPage.

chrome/browser/ui/search/instant_controller.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_
 #define CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_
 
 #include <stdint.h>
 
 #include <list>
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/search/instant_page.h"
 #include "chrome/common/search/search_types.h"
 
 class BrowserInstantController;
 class GURL;
+class InstantPage;
 class InstantService;
-class InstantTab;
 class Profile;
 struct EmbeddedSearchRequestParams;
 
 namespace content {
 class WebContents;
 }
 
 // InstantController drives Chrome Instant, i.e., the browser implementation of
 // the Embedded Search API (see http://dev.chromium.org/embeddedsearch).
 //
@@ skipping 34 matching lines @@
   const std::list<std::pair<int64_t, std::string>>& debug_events() {
     return debug_events_;
   }
 
   // Used by BrowserInstantController to notify InstantController about the
   // instant support change event for the active web contents.
   void InstantSupportChanged(InstantSupportState instant_support);
 
  protected:
   // Accessors are made protected for testing purposes.
-  virtual InstantTab* instant_tab() const;
+  virtual InstantPage* instant_tab() const;
 
   virtual Profile* profile() const;
 
  private:
   friend class InstantExtendedManualTest;
   friend class InstantTestBase;
 
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ExtendedModeIsOn);
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, MostVisited);
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ProcessIsolation);
@@ skipping 28 matching lines @@
 
   // Sends theme info and most visited items to the Instant tab.
   void UpdateInfoForInstantTab();
 
   // Returns the InstantService for the browser profile.
   InstantService* GetInstantService() const;
 
   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_;
 
   // List of events and their timestamps, useful in debugging Instant behaviour.
   mutable std::list<std::pair<int64_t, std::string>> debug_events_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantController);
 };
 
 #endif  // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_