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

chrome/browser/ui/search/search_ipc_router.h

 // Copyright 2013 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_SEARCH_IPC_ROUTER_H_
 #define CHROME_BROWSER_UI_SEARCH_SEARCH_IPC_ROUTER_H_
 
 #include <vector>
 
 #include "base/gtest_prod_util.h"
@@ skipping 96 matching lines @@
     virtual bool ShouldSendMostVisitedItems() = 0;
     virtual bool ShouldSendThemeBackgroundInfo() = 0;
     virtual bool ShouldSendToggleVoiceSearch() = 0;
     virtual bool ShouldSubmitQuery() = 0;
   };
 
   SearchIPCRouter(content::WebContents* web_contents, Delegate* delegate,
                   scoped_ptr<Policy> policy);
   virtual ~SearchIPCRouter();
 
+  // Tells the SearchIPCRouter that a new page in an Instant process committed.
+  void OnNavigationEntryCommitted();
+
   // Tells the renderer to determine if the page supports the Instant API, which
   // results in a call to OnInstantSupportDetermined() when the reply is
   // received.
   void DetermineIfPageSupportsInstant();
 
   // Tells the renderer about the result of the Chrome identity check.
   void SendChromeIdentityCheckResult(const base::string16& identity,
                                      bool identity_match);
 
   // Tells the renderer information it needs to display promos.
@@ skipping 45 matching lines @@
                            PageURLDoesntBelongToInstantRenderer);
   FRIEND_TEST_ALL_PREFIXES(SearchIPCRouterTest,
                            IgnoreMessageIfThePageIsNotActive);
   FRIEND_TEST_ALL_PREFIXES(SearchIPCRouterTest,
                            DoNotSendSetDisplayInstantResultsMsg);
   FRIEND_TEST_ALL_PREFIXES(SearchIPCRouterTest, HandleTabChangedEvents);
 
   // Overridden from contents::WebContentsObserver:
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
-  void OnInstantSupportDetermined(int page_id, bool supports_instant) const;
+  void OnInstantSupportDetermined(int page_seq_no, bool supports_instant) const;
   void OnVoiceSearchSupportDetermined(int page_id,
                                       bool supports_voice_search) const;
   void OnFocusOmnibox(int page_id, OmniboxFocusState state) const;
   void OnSearchBoxNavigate(int page_id,
                            const GURL& url,
                            WindowOpenDisposition disposition,
                            bool is_most_visited_item_url) const;
-  void OnDeleteMostVisitedItem(int page_id, const GURL& url) const;
-  void OnUndoMostVisitedDeletion(int page_id, const GURL& url) const;
-  void OnUndoAllMostVisitedDeletions(int page_id) const;
-  void OnLogEvent(int page_id, NTPLoggingEventType event) const;
-  void OnLogMostVisitedImpression(int page_id,
+  void OnDeleteMostVisitedItem(int page_seq_no, const GURL& url) const;
+  void OnUndoMostVisitedDeletion(int page_seq_no, const GURL& url) const;
+  void OnUndoAllMostVisitedDeletions(int page_seq_no) const;
+  void OnLogEvent(int page_seq_no, NTPLoggingEventType event) const;
+  void OnLogMostVisitedImpression(int page_seq_no,
                                   int position,
                                   const base::string16& provider) const;
-  void OnLogMostVisitedNavigation(int page_id,
+  void OnLogMostVisitedNavigation(int page_seq_no,
                                   int position,
                                   const base::string16& provider) const;
-  void OnPasteAndOpenDropDown(int page_id, const base::string16& text) const;
-  void OnChromeIdentityCheck(int page_id, const base::string16& identity) const;
+  void OnPasteAndOpenDropDown(int page_seq_no,
+                              const base::string16& text) const;
+  void OnChromeIdentityCheck(int page_seq_no,
+                             const base::string16& identity) const;
 
   // Used by unit tests to set a fake delegate.
-  void set_delegate(Delegate* delegate);
+  void set_delegate_for_testing(Delegate* delegate);
 
   // Used by unit tests.
-  void set_policy(scoped_ptr<Policy> policy);
+  void set_policy_for_testing(scoped_ptr<Policy> policy);
 
   // Used by unit tests.
-  Policy* policy() const { return policy_.get(); }
+  Policy* policy_for_testing() const { return policy_.get(); }
+
+  // Used by unit tests.
+  int page_seq_no_for_testing() const { return commit_counter_; }
 
   Delegate* delegate_;
   scoped_ptr<Policy> policy_;
 
+  // Holds the number of main frame commits executed in this tab. Used by the
+  // SearchIPCRouter to ensure that delayed IPC replies are ignored.
+  int commit_counter_;
+
   // Set to true, when the tab corresponding to |this| instance is active.
   bool is_active_tab_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchIPCRouter);
 };
 
 #endif  // CHROME_BROWSER_UI_SEARCH_SEARCH_IPC_ROUTER_H_