Merge InstantPage into InstantTab.

chrome/browser/ui/search/instant_controller.cc

 // 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.
 
 #include "chrome/browser/ui/search/instant_controller.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/location.h"
@@ skipping 13 matching lines @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "url/gurl.h"
 
 // Macro used for logging debug events. |message| should be a std::string.
 #define LOG_INSTANT_DEBUG_EVENT(controller, message) \
     controller->LogDebugEvent(message)
 
 namespace {
 
-bool IsContentsFrom(const InstantPage* page,
+bool IsContentsFrom(const InstantTab* page,
                     const content::WebContents* contents) {
   return page && (page->web_contents() == contents);
 }
 
 // Adds a transient NavigationEntry to the supplied |contents|'s
 // NavigationController if the page's URL has not already been updated with the
 // supplied |search_terms|. Sets the |search_terms| on the transient entry for
 // search terms extraction to work correctly.
 void EnsureSearchTermsAreSet(content::WebContents* contents,
                              const base::string16& search_terms) {
@@ skipping 72 matching lines @@
 Profile* InstantController::profile() const {
   return browser_->profile();
 }
 
 InstantTab* InstantController::instant_tab() const {
   return instant_tab_.get();
 }
 
 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;
 
   ResetInstantTab();
 }
 
 void InstantController::InstantSupportDetermined(
     const content::WebContents* contents,
     bool supports_instant) {
   DCHECK(IsContentsFrom(instant_tab(), contents));
 
   if (!supports_instant)
     base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE,
                                                     instant_tab_.release());
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,
       content::Source<InstantController>(this),
       content::NotificationService::NoDetails());
 }
 
-void InstantController::InstantPageAboutToNavigateMainFrame(
+void InstantController::InstantTabAboutToNavigateMainFrame(
     const content::WebContents* contents,
     const GURL& url) {
   DCHECK(IsContentsFrom(instant_tab(), contents));
 
   // The Instant tab navigated.  Send it the data it needs to display
   // properly.
   UpdateInfoForInstantTab();
 }
 
 void InstantController::ResetInstantTab() {
@@ skipping 16 matching lines @@
     if (instant_service) {
       instant_service->UpdateThemeInfo();
       instant_service->UpdateMostVisitedItemsInfo();
     }
   }
 }
 
 InstantService* InstantController::GetInstantService() const {
   return InstantServiceFactory::GetForProfile(profile());
 }