Remove DetermineIfPageSupportsInstant and all its plumbing

chrome/browser/ui/search/search_tab_helper.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/search_tab_helper.h"
 
 #include <memory>
 #include <set>
 
 #include "base/memory/ptr_util.h"
@@ skipping 56 matching lines @@
   // We can't use WebContents::GetURL() because that uses the active entry,
   // whereas we want the visible entry.
   const content::NavigationEntry* entry =
       contents->GetController().GetVisibleEntry();
   if (entry && entry->GetVirtualURL() == chrome::kChromeUINewTabURL)
     return true;
 
   return search::IsInstantNTP(contents);
 }
 
-bool IsLocal(const content::WebContents* contents) {
-  if (!contents)
-    return false;
-  const content::NavigationEntry* entry =
-      contents->GetController().GetVisibleEntry();
-  return entry && entry->GetURL() == chrome::kChromeSearchLocalNtpUrl;
-}
-
 // Returns true if |contents| are rendered inside an Instant process.
 bool InInstantProcess(Profile* profile,
                       const content::WebContents* contents) {
   if (!profile || !contents)
     return false;
 
   InstantService* instant_service =
       InstantServiceFactory::GetForProfile(profile);
   return instant_service &&
       instant_service->IsInstantProcess(
@@ skipping 197 matching lines @@
         entry, l10n_util::GetStringUTF16(IDS_NEW_TAB_TITLE));
   }
 }
 
 void SearchTabHelper::DidFinishLoad(content::RenderFrameHost* render_frame_host,
                                     const GURL& /* validated_url */) {
   if (!render_frame_host->GetParent()) {
     if (search::IsInstantNTP(web_contents_))
       RecordNewTabLoadTime(web_contents_);
 
-    DetermineIfPageSupportsInstant();
+    InstantSupportChanged(InInstantProcess(profile(), web_contents_));
   }
 }
 
 void SearchTabHelper::NavigationEntryCommitted(
     const content::LoadCommittedDetails& load_details) {
   if (!is_search_enabled_)
     return;
 
   if (!load_details.is_main_frame)
     return;
@@ skipping 179 matching lines @@
   if (omnibox_view && omnibox_view->model()->user_input_in_progress())
     type = SearchMode::MODE_SEARCH_SUGGESTIONS;
 
   SearchMode old_mode(model_.mode());
   model_.SetMode(SearchMode(type, origin));
   if (old_mode.is_ntp() != model_.mode().is_ntp()) {
     ipc_router_.SetInputInProgress(IsInputInProgress());
   }
 }
 
-void SearchTabHelper::DetermineIfPageSupportsInstant() {
-  if (!InInstantProcess(profile(), web_contents_)) {
-    // The page is not in the Instant process. This page does not support
-    // instant. If we send an IPC message to a page that is not in the Instant
-    // process, it will never receive it and will never respond. Therefore,
-    // return immediately.
-    InstantSupportChanged(false);
-  } else if (IsLocal(web_contents_)) {
-    // Local pages always support Instant.
-    InstantSupportChanged(true);
-  } else {
-    ipc_router_.DetermineIfPageSupportsInstant();
-  }
-}
-
 const OmniboxView* SearchTabHelper::GetOmniboxView() const {
 #if defined(OS_ANDROID)
   return nullptr;
 #else
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents_);
   if (!browser)
     return nullptr;
 
   return browser->window()->GetLocationBar()->GetOmniboxView();
 #endif  // OS_ANDROID
 }
 
 OmniboxView* SearchTabHelper::GetOmniboxView() {
   return const_cast<OmniboxView*>(
       const_cast<const SearchTabHelper*>(this)->GetOmniboxView());
 }
 
 Profile* SearchTabHelper::profile() const {
   return Profile::FromBrowserContext(web_contents_->GetBrowserContext());
 }
 
 bool SearchTabHelper::IsInputInProgress() const {
   if (model_.mode().is_ntp())
     return false;
   const OmniboxView* omnibox_view = GetOmniboxView();
   return omnibox_view &&
          omnibox_view->model()->focus_state() == OMNIBOX_FOCUS_VISIBLE;
 }