Remove WebContents::IsActiveEntry from Instant Extended and from WebContents.

chrome/renderer/searchbox/searchbox.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/renderer/searchbox/searchbox.h"
 
 #include <string>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 125 matching lines @@
   path = path.substr(1);
 
   return GetInstantRestrictedIDFromPath(render_view_id, path, id);
 }
 
 }  // namespace internal
 
 SearchBox::SearchBox(content::RenderView* render_view)
     : content::RenderViewObserver(render_view),
       content::RenderViewObserverTracker<SearchBox>(render_view),
+    page_seq_no_(0),
     app_launcher_enabled_(false),
     is_focused_(false),
     is_input_in_progress_(false),
     is_key_capture_enabled_(false),
     display_instant_results_(false),
     most_visited_items_cache_(kMaxInstantMostVisitedItemCacheSize),
     query_(),
     start_margin_(0) {
 }
 
 SearchBox::~SearchBox() {
 }
 
 void SearchBox::LogEvent(NTPLoggingEventType event) {
   render_view()->Send(new ChromeViewHostMsg_LogEvent(
-      render_view()->GetRoutingID(), render_view()->GetPageId(), event));
+      render_view()->GetRoutingID(), page_seq_no_, event));
 }
 
 void SearchBox::LogMostVisitedImpression(int position,
                                          const base::string16& provider) {
   render_view()->Send(new ChromeViewHostMsg_LogMostVisitedImpression(
-      render_view()->GetRoutingID(), render_view()->GetPageId(), position,
-      provider));
+      render_view()->GetRoutingID(), page_seq_no_, position, provider));
 }
 
 void SearchBox::LogMostVisitedNavigation(int position,
                                          const base::string16& provider) {
   render_view()->Send(new ChromeViewHostMsg_LogMostVisitedNavigation(
-      render_view()->GetRoutingID(), render_view()->GetPageId(), position,
-      provider));
+      render_view()->GetRoutingID(), page_seq_no_, position, provider));
 }
 
 void SearchBox::CheckIsUserSignedInToChromeAs(const base::string16& identity) {
   render_view()->Send(new ChromeViewHostMsg_ChromeIdentityCheck(
-      render_view()->GetRoutingID(), render_view()->GetPageId(), identity));
+      render_view()->GetRoutingID(), page_seq_no_, identity));
 }
 
 void SearchBox::DeleteMostVisitedItem(
     InstantRestrictedID most_visited_item_id) {
   render_view()->Send(new ChromeViewHostMsg_SearchBoxDeleteMostVisitedItem(
-      render_view()->GetRoutingID(), render_view()->GetPageId(),
+      render_view()->GetRoutingID(),
+      page_seq_no_,
       GetURLForMostVisitedItem(most_visited_item_id)));
 }
 
 bool SearchBox::GenerateFaviconURLFromTransientURL(const GURL& transient_url,
                                                    GURL* url) const {
   std::string favicon_params;
   InstantRestrictedID rid = -1;
   bool success = internal::GetRestrictedIDFromFaviconUrl(
       render_view()->GetRoutingID(), transient_url, &favicon_params, &rid);
   if (!success)
@@ skipping 37 matching lines @@
   return most_visited_items_cache_.GetItemWithRestrictedID(most_visited_item_id,
                                                            item);
 }
 
 const ThemeBackgroundInfo& SearchBox::GetThemeBackgroundInfo() {
   return theme_info_;
 }
 
 void SearchBox::Focus() {
   render_view()->Send(new ChromeViewHostMsg_FocusOmnibox(
-      render_view()->GetRoutingID(), render_view()->GetPageId(),
-      OMNIBOX_FOCUS_VISIBLE));
+      render_view()->GetRoutingID(), page_seq_no_, OMNIBOX_FOCUS_VISIBLE));
 }
 
 void SearchBox::NavigateToURL(const GURL& url,
                               WindowOpenDisposition disposition,
                               bool is_most_visited_item_url) {
   render_view()->Send(new ChromeViewHostMsg_SearchBoxNavigate(
-      render_view()->GetRoutingID(), render_view()->GetPageId(), url,
+      render_view()->GetRoutingID(), page_seq_no_, url,
       disposition, is_most_visited_item_url));
 }
 
 void SearchBox::Paste(const base::string16& text) {
   render_view()->Send(new ChromeViewHostMsg_PasteAndOpenDropdown(
-      render_view()->GetRoutingID(), render_view()->GetPageId(), text));
+      render_view()->GetRoutingID(), page_seq_no_, text));
 }
 
 void SearchBox::SetVoiceSearchSupported(bool supported) {
   render_view()->Send(new ChromeViewHostMsg_SetVoiceSearchSupported(
-      render_view()->GetRoutingID(), render_view()->GetPageId(), supported));
+      render_view()->GetRoutingID(), page_seq_no_, supported));
 }
 
 void SearchBox::StartCapturingKeyStrokes() {
   render_view()->Send(new ChromeViewHostMsg_FocusOmnibox(
-      render_view()->GetRoutingID(), render_view()->GetPageId(),
-      OMNIBOX_FOCUS_INVISIBLE));
+      render_view()->GetRoutingID(), page_seq_no_, OMNIBOX_FOCUS_INVISIBLE));
 }
 
 void SearchBox::StopCapturingKeyStrokes() {
   render_view()->Send(new ChromeViewHostMsg_FocusOmnibox(
-      render_view()->GetRoutingID(), render_view()->GetPageId(),
-      OMNIBOX_FOCUS_NONE));
+      render_view()->GetRoutingID(), page_seq_no_, OMNIBOX_FOCUS_NONE));
 }
 
 void SearchBox::UndoAllMostVisitedDeletions() {
   render_view()->Send(
       new ChromeViewHostMsg_SearchBoxUndoAllMostVisitedDeletions(
-      render_view()->GetRoutingID(), render_view()->GetPageId()));
+          page_seq_no_, render_view()->GetRoutingID()));
 }
 
 void SearchBox::UndoMostVisitedDeletion(
     InstantRestrictedID most_visited_item_id) {
   render_view()->Send(new ChromeViewHostMsg_SearchBoxUndoMostVisitedDeletion(
-      render_view()->GetRoutingID(), render_view()->GetPageId(),
+      render_view()->GetRoutingID(), page_seq_no_,
       GetURLForMostVisitedItem(most_visited_item_id)));
 }
 
 bool SearchBox::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(SearchBox, message)
+    IPC_MESSAGE_HANDLER(ChromeViewMsg_SetPageSequenceNumber,
+                        OnSetPageSequenceNumber)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_ChromeIdentityCheckResult,
                         OnChromeIdentityCheckResult)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_DetermineIfPageSupportsInstant,
                         OnDetermineIfPageSupportsInstant)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxFocusChanged, OnFocusChanged)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxMarginChange, OnMarginChange)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxMostVisitedItemsChanged,
                         OnMostVisitedChanged)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxPromoInformation,
                         OnPromoInformationReceived)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxSetDisplayInstantResults,
                         OnSetDisplayInstantResults)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxSetInputInProgress,
                         OnSetInputInProgress)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxSetSuggestionToPrefetch,
                         OnSetSuggestionToPrefetch)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxSubmit, OnSubmit)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxThemeChanged,
                         OnThemeChanged)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxToggleVoiceSearch,
                         OnToggleVoiceSearch)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
+void SearchBox::OnSetPageSequenceNumber(int page_seq_no) {
+  page_seq_no_ = page_seq_no;
+}
+
 void SearchBox::OnChromeIdentityCheckResult(const base::string16& identity,
                                             bool identity_match) {
   if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
     extensions_v8::SearchBoxExtension::DispatchChromeIdentityCheckResult(
         render_view()->GetWebView()->mainFrame(), identity, identity_match);
   }
 }
 
 void SearchBox::OnDetermineIfPageSupportsInstant() {
   if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
     bool result = extensions_v8::SearchBoxExtension::PageSupportsInstant(
         render_view()->GetWebView()->mainFrame());
     DVLOG(1) << render_view() << " PageSupportsInstant: " << result;
     render_view()->Send(new ChromeViewHostMsg_InstantSupportDetermined(
-        render_view()->GetRoutingID(), render_view()->GetPageId(), result));
+        render_view()->GetRoutingID(), page_seq_no_, result));
   }
 }
 
 void SearchBox::OnFocusChanged(OmniboxFocusState new_focus_state,
                                OmniboxFocusChangeReason reason) {
   bool key_capture_enabled = new_focus_state == OMNIBOX_FOCUS_INVISIBLE;
   if (key_capture_enabled != is_key_capture_enabled_) {
     // Tell the page if the key capture mode changed unless the focus state
     // changed because of TYPING. This is because in that case, the browser
     // hasn't really stopped capturing key strokes.
@@ skipping 116 matching lines @@
 }
 
 void SearchBox::Reset() {
   query_.clear();
   suggestion_ = InstantSuggestion();
   start_margin_ = 0;
   is_focused_ = false;
   is_key_capture_enabled_ = false;
   theme_info_ = ThemeBackgroundInfo();
 }