Merge InstantPage into InstantTab.

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/browser/ui/search/instant_tab.h"
 #include "chrome/common/search/search_types.h"
 
 class BrowserInstantController;
 class GURL;
 class InstantService;
 class InstantTab;

[Marc Treib, 2016/07/13 15:54:04]

nit: not required anymore

[sfiera, 2016/07/13 16:05:46]

Done.

 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).
 //
 // In extended mode, InstantController maintains and coordinates an InstantTab

[Marc Treib, 2016/07/13 15:54:04]

nit: period at end of sentence

[sfiera, 2016/07/13 16:05:46]

Done.

-// instance of InstantPage. An InstantTab instance points to the currently
-// active tab, if it supports the Embedded Search API. InstantTab is backed by a
-// WebContents and it does not own that WebContents.
+// An InstantTab instance points to the currently active tab, if it supports the
+// Embedded Search API. InstantTab is backed by a WebContents and it does not
+// own that WebContents.
 //
 // InstantController is owned by Browser via BrowserInstantController.
-class InstantController : public InstantPage::Delegate {
+class InstantController : public InstantTab::Delegate {
  public:
   explicit InstantController(BrowserInstantController* browser);
   ~InstantController() override;
 
   // Called if the browser is navigating to a search URL for |search_terms| with
   // search-term-replacement enabled. If |instant_tab_| can be used to process
   // the search, this does so and returns true. Else, returns false.
   bool SubmitQuery(const base::string16& search_terms,
                    const EmbeddedSearchRequestParams& params);
 
@@ skipping 45 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, KeyboardTogglesVoiceSearch);
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, HomeButtonAffectsMargin);
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, SearchReusesInstantTab);
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
                            SearchDoesntReuseInstantTabWithoutSupport);
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
                            TypedSearchURLDoesntReuseInstantTab);
   FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
                            DispatchMVChangeEventWhileNavigatingBackToNTP);
 
-  // Overridden from InstantPage::Delegate:
+  // Overridden from InstantTab::Delegate:
   // TODO(shishir): We assume that the WebContent's current RenderViewHost is
   // the RenderViewHost being created which is not always true. Fix this.
   void InstantSupportDetermined(const content::WebContents* contents,
                                 bool supports_instant) override;
-  void InstantPageAboutToNavigateMainFrame(const content::WebContents* contents,
-                                           const GURL& url) override;
+  void InstantTabAboutToNavigateMainFrame(const content::WebContents* contents,
+                                          const GURL& url) override;
 
   // If the active tab is an Instant search results page, sets |instant_tab_| to
   // point to it. Else, deletes any existing |instant_tab_|.
   void ResetInstantTab();
 
   // 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.
+  // The instance of InstantTab maintained by InstantController.
   std::unique_ptr<InstantTab> 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_