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

chrome/browser/ui/search/search_ipc_router_unittest.cc

 // 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.
 
 #include "chrome/browser/ui/search/search_ipc_router.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 120 matching lines @@
       content::WebContents* web_contents) {
     EXPECT_NE(static_cast<content::WebContents*>(NULL), web_contents);
     return SearchTabHelper::FromWebContents(web_contents);
   }
 
   void SetupMockDelegateAndPolicy() {
     content::WebContents* contents = web_contents();
     ASSERT_NE(static_cast<content::WebContents*>(NULL), contents);
     SearchTabHelper* search_tab_helper = GetSearchTabHelper(contents);
     ASSERT_NE(static_cast<SearchTabHelper*>(NULL), search_tab_helper);
-    search_tab_helper->ipc_router().set_delegate(mock_delegate());
-    search_tab_helper->ipc_router().set_policy(
+    search_tab_helper->ipc_router().set_delegate_for_testing(mock_delegate());
+    search_tab_helper->ipc_router().set_policy_for_testing(
         make_scoped_ptr(new MockSearchIPCRouterPolicy)
             .PassAs<SearchIPCRouter::Policy>());
   }
 
   bool MessageWasSent(uint32 id) {
     return process()->sink().GetFirstMessageMatching(id) != NULL;
   }
 
   void VerifyDisplayInstantResultsMsg(bool expected_param_value) {
     SetupMockDelegateAndPolicy();
@@ skipping 12 matching lines @@
   }
 
   MockSearchIPCRouterDelegate* mock_delegate() { return &delegate_; }
 
   MockSearchIPCRouterPolicy* GetSearchIPCRouterPolicy() {
     content::WebContents* contents = web_contents();
     EXPECT_NE(static_cast<content::WebContents*>(NULL), contents);
     SearchTabHelper* search_tab_helper = GetSearchTabHelper(contents);
     EXPECT_NE(static_cast<SearchTabHelper*>(NULL), search_tab_helper);
     return static_cast<MockSearchIPCRouterPolicy*>(
-        search_tab_helper->ipc_router().policy());
+        search_tab_helper->ipc_router().policy_for_testing());
   }
 
   SearchIPCRouter& GetSearchIPCRouter() {
     return GetSearchTabHelper(web_contents())->ipc_router();
   }
 
+  int GetSearchIPCRouterSeqNo() {
+    return GetSearchIPCRouter().page_seq_no_for_testing();
+  }
+
   void OnMessageReceived(const IPC::Message& message) {
     GetSearchIPCRouter().OnMessageReceived(message);
   }
 
   bool IsActiveTab(content::WebContents* contents) {
     return GetSearchTabHelper(contents)->ipc_router().is_active_tab_;
   }
 
  private:
   MockSearchIPCRouterDelegate delegate_;
   base::FieldTrialList field_trial_list_;
 };
 
 TEST_F(SearchIPCRouterTest, ProcessVoiceSearchSupportMsg) {
   NavigateAndCommitActiveTab(GURL("chrome-search://foo/bar"));
   SetupMockDelegateAndPolicy();
   MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
   EXPECT_CALL(*mock_delegate(), OnSetVoiceSearchSupport(true)).Times(1);
   EXPECT_CALL(*(policy), ShouldProcessSetVoiceSearchSupport()).Times(1)
       .WillOnce(testing::Return(true));
 
   content::WebContents* contents = web_contents();
   scoped_ptr<IPC::Message> message(
       new ChromeViewHostMsg_SetVoiceSearchSupported(
           contents->GetRoutingID(),
-          contents->GetController().GetVisibleEntry()->GetPageID(),
+          GetSearchIPCRouterSeqNo(),

[kmadhusu, 2014/05/30 18:05:39]

style nit: Please move this argument to the previous line (same in other
places).

[Avi (use Gerrit), 2014/05/30 18:10:23]

Done.

           true));
   OnMessageReceived(*message);
 }
 
 TEST_F(SearchIPCRouterTest, IgnoreVoiceSearchSupportMsg) {
   NavigateAndCommitActiveTab(GURL("chrome-search://foo/bar"));
   EXPECT_CALL(*mock_delegate(), OnSetVoiceSearchSupport(true)).Times(0);
   SetupMockDelegateAndPolicy();
   MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
   EXPECT_CALL(*policy, ShouldProcessSetVoiceSearchSupport()).Times(1)
       .WillOnce(testing::Return(false));
 
   content::WebContents* contents = web_contents();
   scoped_ptr<IPC::Message> message(
       new ChromeViewHostMsg_SetVoiceSearchSupported(
           contents->GetRoutingID(),
-          contents->GetController().GetVisibleEntry()->GetPageID(),
+          GetSearchIPCRouterSeqNo(),
           true));
   OnMessageReceived(*message);
 }
 
 TEST_F(SearchIPCRouterTest, ProcessFocusOmniboxMsg) {
   NavigateAndCommitActiveTab(GURL(chrome::kChromeSearchLocalNtpUrl));
   SetupMockDelegateAndPolicy();
   MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
   EXPECT_CALL(*mock_delegate(), FocusOmnibox(OMNIBOX_FOCUS_VISIBLE)).Times(1);
 
   content::WebContents* contents = web_contents();
   bool is_active_tab = IsActiveTab(contents);
   EXPECT_TRUE(is_active_tab);
   EXPECT_CALL(*policy, ShouldProcessFocusOmnibox(is_active_tab)).Times(1)
       .WillOnce(testing::Return(true));
 
   scoped_ptr<IPC::Message> message(new ChromeViewHostMsg_FocusOmnibox(
       contents->GetRoutingID(),
-      contents->GetController().GetVisibleEntry()->GetPageID(),
+      GetSearchIPCRouterSeqNo(),
       OMNIBOX_FOCUS_VISIBLE));
   OnMessageReceived(*message);
 }
 
 TEST_F(SearchIPCRouterTest, IgnoreFocusOmniboxMsg) {
   NavigateAndCommitActiveTab(GURL("chrome-search://foo/bar"));
   SetupMockDelegateAndPolicy();
   MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
   EXPECT_CALL(*mock_delegate(), FocusOmnibox(OMNIBOX_FOCUS_VISIBLE)).Times(0);
 
   content::WebContents* contents = web_contents();
   bool is_active_tab = IsActiveTab(contents);
   EXPECT_TRUE(is_active_tab);
   EXPECT_CALL(*policy, ShouldProcessFocusOmnibox(is_active_tab)).Times(1)
       .WillOnce(testing::Return(false));
 
   scoped_ptr<IPC::Message> message(new ChromeViewHostMsg_FocusOmnibox(
       contents->GetRoutingID(),
-      contents->GetController().GetVisibleEntry()->GetPageID(),
+      GetSearchIPCRouterSeqNo(),
       OMNIBOX_FOCUS_VISIBLE));
   OnMessageReceived(*message);
 }
 
 TEST_F(SearchIPCRouterTest, HandleTabChangedEvents) {
   NavigateAndCommitActiveTab(GURL("chrome-search://foo/bar"));
   content::WebContents* contents = web_contents();
   EXPECT_EQ(0, browser()->tab_strip_model()->GetIndexOfWebContents(contents));
   EXPECT_TRUE(IsActiveTab(contents));
 
@@ skipping 20 matching lines @@
   content::WebContents* contents = web_contents();
   bool is_active_tab = IsActiveTab(contents);
   EXPECT_TRUE(is_active_tab);
 
   MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
   EXPECT_CALL(*policy, ShouldProcessNavigateToURL(is_active_tab)).Times(1)
       .WillOnce(testing::Return(true));
 
   scoped_ptr<IPC::Message> message(new ChromeViewHostMsg_SearchBoxNavigate(
       contents->GetRoutingID(),
-      contents->GetController().GetVisibleEntry()->GetPageID(),
+      GetSearchIPCRouterSeqNo(),
       destination_url, CURRENT_TAB, true));
   OnMessageReceived(*message);
 }
 
 TEST_F(SearchIPCRouterTest, IgnoreNavigateToURLMsg) {
   NavigateAndCommitActiveTab(GURL("chrome-search://foo/bar"));
   SetupMockDelegateAndPolicy();
   GURL destination_url("www.foo.com");
   EXPECT_CALL(*mock_delegate(), NavigateToURL(destination_url, CURRENT_TAB,
                                               true)).Times(0);
   content::WebContents* contents = web_contents();
   bool is_active_tab = IsActiveTab(contents);
   EXPECT_TRUE(is_active_tab);
 
   MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
   EXPECT_CALL(*policy, ShouldProcessNavigateToURL(is_active_tab)).Times(1)
       .WillOnce(testing::Return(false));
 
   scoped_ptr<IPC::Message> message(new ChromeViewHostMsg_SearchBoxNavigate(
       contents->GetRoutingID(),
-      contents->GetController().GetVisibleEntry()->GetPageID(),
+      GetSearchIPCRouterSeqNo(),
       destination_url, CURRENT_TAB, true));
   OnMessageReceived(*message);
 }
 
 TEST_F(SearchIPCRouterTest, ProcessLogEventMsg) {
   NavigateAndCommitActiveTab(GURL(chrome::kChromeSearchLocalNtpUrl));
   SetupMockDelegateAndPolicy();
   MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
   EXPECT_CALL(*mock_delegate(), OnLogEvent(NTP_MOUSEOVER)).Times(1);
   EXPECT_CALL(*policy, ShouldProcessLogEvent()).Times(1)
       .WillOnce(testing::Return(true));
 
   content::WebContents* contents = web_contents();
   scoped_ptr<IPC::Message> message(new ChromeViewHostMsg_LogEvent(
-      contents->GetRoutingID(),
-      contents->GetController().GetVisibleEntry()->GetPageID(),
+      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(),
       NTP_MOUSEOVER));
   OnMessageReceived(*message);
 }
 
 TEST_F(SearchIPCRouterTest, IgnoreLogEventMsg) {
   NavigateAndCommitActiveTab(GURL("chrome-search://foo/bar"));
   SetupMockDelegateAndPolicy();
   MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
   EXPECT_CALL(*mock_delegate(), OnLogEvent(NTP_MOUSEOVER)).Times(0);
   EXPECT_CALL(*policy, ShouldProcessLogEvent()).Times(1)
       .WillOnce(testing::Return(false));
 
   content::WebContents* contents = web_contents();
   scoped_ptr<IPC::Message> message(new ChromeViewHostMsg_LogEvent(
-      contents->GetRoutingID(),
-      contents->GetController().GetVisibleEntry()->GetPageID(),
+      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(),
       NTP_MOUSEOVER));
   OnMessageReceived(*message);
 }
 
 TEST_F(SearchIPCRouterTest, ProcessLogMostVisitedImpressionMsg) {
   NavigateAndCommitActiveTab(GURL(chrome::kChromeSearchLocalNtpUrl));
   SetupMockDelegateAndPolicy();
   MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
   EXPECT_CALL(*mock_delegate(),
       OnLogMostVisitedImpression(3, base::ASCIIToUTF16("Server"))).Times(1);
   EXPECT_CALL(*policy, ShouldProcessLogEvent()).Times(1)
       .WillOnce(testing::Return(true));
 
   content::WebContents* contents = web_contents();
   scoped_ptr<IPC::Message> message(
       new ChromeViewHostMsg_LogMostVisitedImpression(
       contents->GetRoutingID(),
-      contents->GetController().GetVisibleEntry()->GetPageID(),
+      GetSearchIPCRouterSeqNo(),
       3,
       base::ASCIIToUTF16("Server")));
   OnMessageReceived(*message);
 }
 
 TEST_F(SearchIPCRouterTest, ProcessLogMostVisitedNavigationMsg) {
   NavigateAndCommitActiveTab(GURL(chrome::kChromeSearchLocalNtpUrl));
   SetupMockDelegateAndPolicy();
   MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
   EXPECT_CALL(*mock_delegate(),
       OnLogMostVisitedNavigation(3, base::ASCIIToUTF16("Server"))).Times(1);
   EXPECT_CALL(*policy, ShouldProcessLogEvent()).Times(1)
       .WillOnce(testing::Return(true));
 
   content::WebContents* contents = web_contents();
   scoped_ptr<IPC::Message> message(
       new ChromeViewHostMsg_LogMostVisitedNavigation(
       contents->GetRoutingID(),
-      contents->GetController().GetVisibleEntry()->GetPageID(),
+      GetSearchIPCRouterSeqNo(),
       3,
       base::ASCIIToUTF16("Server")));
   OnMessageReceived(*message);
 }
 
 TEST_F(SearchIPCRouterTest, ProcessChromeIdentityCheckMsg) {
   NavigateAndCommitActiveTab(GURL(chrome::kChromeSearchLocalNtpUrl));
   SetupMockDelegateAndPolicy();
   MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
   const base::string16 test_identity = base::ASCIIToUTF16("foo@bar.com");
   EXPECT_CALL(*mock_delegate(), OnChromeIdentityCheck(test_identity)).Times(1);
   EXPECT_CALL(*policy, ShouldProcessChromeIdentityCheck()).Times(1)
       .WillOnce(testing::Return(true));
 
   content::WebContents* contents = web_contents();
   scoped_ptr<IPC::Message> message(new ChromeViewHostMsg_ChromeIdentityCheck(
-      contents->GetRoutingID(),
-      contents->GetController().GetVisibleEntry()->GetPageID(),
-      test_identity));
+      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(), test_identity));
   OnMessageReceived(*message);
 }
 
 TEST_F(SearchIPCRouterTest, IgnoreChromeIdentityCheckMsg) {
   NavigateAndCommitActiveTab(GURL("chrome-search://foo/bar"));
   SetupMockDelegateAndPolicy();
   MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
 
   const base::string16 test_identity = base::ASCIIToUTF16("foo@bar.com");
   EXPECT_CALL(*mock_delegate(), OnChromeIdentityCheck(test_identity)).Times(0);
   EXPECT_CALL(*policy, ShouldProcessChromeIdentityCheck()).Times(1)
       .WillOnce(testing::Return(false));
 
   content::WebContents* contents = web_contents();
   scoped_ptr<IPC::Message> message(new ChromeViewHostMsg_ChromeIdentityCheck(
-      contents->GetRoutingID(),
-      contents->GetController().GetVisibleEntry()->GetPageID(),
-      test_identity));
+      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(), test_identity));
   OnMessageReceived(*message);
 }
 
 TEST_F(SearchIPCRouterTest, ProcessDeleteMostVisitedItemMsg) {
   NavigateAndCommitActiveTab(GURL("chrome-search://foo/bar"));
   SetupMockDelegateAndPolicy();
   MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
   GURL item_url("www.foo.com");
   EXPECT_CALL(*mock_delegate(), OnDeleteMostVisitedItem(item_url)).Times(1);
   EXPECT_CALL(*policy, ShouldProcessDeleteMostVisitedItem()).Times(1)
       .WillOnce(testing::Return(true));
 
   content::WebContents* contents = web_contents();
   scoped_ptr<IPC::Message> message(
       new ChromeViewHostMsg_SearchBoxDeleteMostVisitedItem(
           contents->GetRoutingID(),
-          contents->GetController().GetVisibleEntry()->GetPageID(),
+          GetSearchIPCRouterSeqNo(),
           item_url));
   OnMessageReceived(*message);
 }
 
 TEST_F(SearchIPCRouterTest, IgnoreDeleteMostVisitedItemMsg) {
   NavigateAndCommitActiveTab(GURL("chrome-search://foo/bar"));
   SetupMockDelegateAndPolicy();
   MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
   GURL item_url("www.foo.com");
   EXPECT_CALL(*mock_delegate(), OnDeleteMostVisitedItem(item_url)).Times(0);
   EXPECT_CALL(*policy, ShouldProcessDeleteMostVisitedItem()).Times(1)
       .WillOnce(testing::Return(false));
 
   content::WebContents* contents = web_contents();
   scoped_ptr<IPC::Message> message(
       new ChromeViewHostMsg_SearchBoxDeleteMostVisitedItem(
           contents->GetRoutingID(),
-          contents->GetController().GetVisibleEntry()->GetPageID(),
+          GetSearchIPCRouterSeqNo(),
           item_url));
   OnMessageReceived(*message);
 }
 
 TEST_F(SearchIPCRouterTest, ProcessUndoMostVisitedDeletionMsg) {
   NavigateAndCommitActiveTab(GURL("chrome-search://foo/bar"));
   SetupMockDelegateAndPolicy();
   MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
   GURL item_url("www.foo.com");
   EXPECT_CALL(*mock_delegate(), OnUndoMostVisitedDeletion(item_url)).Times(1);
   EXPECT_CALL(*policy, ShouldProcessUndoMostVisitedDeletion()).Times(1)
       .WillOnce(testing::Return(true));
 
   content::WebContents* contents = web_contents();
   scoped_ptr<IPC::Message> message(
       new ChromeViewHostMsg_SearchBoxUndoMostVisitedDeletion(
           contents->GetRoutingID(),
-          contents->GetController().GetVisibleEntry()->GetPageID(),
+          GetSearchIPCRouterSeqNo(),
           item_url));
   OnMessageReceived(*message);
 }
 
 TEST_F(SearchIPCRouterTest, IgnoreUndoMostVisitedDeletionMsg) {
   NavigateAndCommitActiveTab(GURL("chrome-search://foo/bar"));
   SetupMockDelegateAndPolicy();
   MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
   GURL item_url("www.foo.com");
   EXPECT_CALL(*mock_delegate(), OnUndoMostVisitedDeletion(item_url)).Times(0);
   EXPECT_CALL(*policy, ShouldProcessUndoMostVisitedDeletion()).Times(1)
       .WillOnce(testing::Return(false));
 
   content::WebContents* contents = web_contents();
   scoped_ptr<IPC::Message> message(
       new ChromeViewHostMsg_SearchBoxUndoMostVisitedDeletion(
           contents->GetRoutingID(),
-          contents->GetController().GetVisibleEntry()->GetPageID(),
+          GetSearchIPCRouterSeqNo(),
           item_url));
   OnMessageReceived(*message);
 }
 
 TEST_F(SearchIPCRouterTest, ProcessUndoAllMostVisitedDeletionsMsg) {
   NavigateAndCommitActiveTab(GURL("chrome-search://foo/bar"));
   SetupMockDelegateAndPolicy();
   MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
   EXPECT_CALL(*mock_delegate(), OnUndoAllMostVisitedDeletions()).Times(1);
   EXPECT_CALL(*policy, ShouldProcessUndoAllMostVisitedDeletions()).Times(1)
       .WillOnce(testing::Return(true));
 
   content::WebContents* contents = web_contents();
   scoped_ptr<IPC::Message> message(
       new ChromeViewHostMsg_SearchBoxUndoAllMostVisitedDeletions(
-          contents->GetRoutingID(),
-          contents->GetController().GetVisibleEntry()->GetPageID()));
+          contents->GetRoutingID(), GetSearchIPCRouterSeqNo()));
   OnMessageReceived(*message);
 }
 
 TEST_F(SearchIPCRouterTest, IgnoreUndoAllMostVisitedDeletionsMsg) {
   NavigateAndCommitActiveTab(GURL("chrome-search://foo/bar"));
   SetupMockDelegateAndPolicy();
   MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
   EXPECT_CALL(*mock_delegate(), OnUndoAllMostVisitedDeletions()).Times(0);
   EXPECT_CALL(*policy, ShouldProcessUndoAllMostVisitedDeletions()).Times(1)
       .WillOnce(testing::Return(false));
 
   content::WebContents* contents = web_contents();
   scoped_ptr<IPC::Message> message(
       new ChromeViewHostMsg_SearchBoxUndoAllMostVisitedDeletions(
-          contents->GetRoutingID(),
-          contents->GetController().GetVisibleEntry()->GetPageID()));
+          contents->GetRoutingID(), GetSearchIPCRouterSeqNo()));
   OnMessageReceived(*message);
 }
 
 TEST_F(SearchIPCRouterTest, IgnoreMessageIfThePageIsNotActive) {
   NavigateAndCommitActiveTab(GURL(chrome::kChromeSearchLocalNtpUrl));
   SetupMockDelegateAndPolicy();
   MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
+  int page_seq_no = GetSearchIPCRouterSeqNo();
 
   content::WebContents* contents = web_contents();
   bool is_active_tab = IsActiveTab(contents);
-  int invalid_page_id = 1000;
   GURL item_url("www.foo.com");
   EXPECT_CALL(*mock_delegate(), NavigateToURL(item_url, CURRENT_TAB,
                                               true)).Times(0);
+  // At this point, in a real test, the navigation would cause the
+  // SearchIPCRouter's page sequence to advance. In this test it doesn't, so
+  // we'll decrement the sequence number on this side to simulate it.
+  --page_seq_no;
   EXPECT_CALL(*policy, ShouldProcessNavigateToURL(is_active_tab)).Times(0);
 
   scoped_ptr<IPC::Message> message(new ChromeViewHostMsg_SearchBoxNavigate(
-      contents->GetRoutingID(), invalid_page_id, item_url, CURRENT_TAB,
-      true));
+      contents->GetRoutingID(), page_seq_no, item_url,
+      CURRENT_TAB, true));
   OnMessageReceived(*message);
 
   EXPECT_CALL(*mock_delegate(), OnDeleteMostVisitedItem(item_url)).Times(0);
   EXPECT_CALL(*policy, ShouldProcessDeleteMostVisitedItem()).Times(0);
   message.reset(new ChromeViewHostMsg_SearchBoxDeleteMostVisitedItem(
-      contents->GetRoutingID(), invalid_page_id, item_url));
+      contents->GetRoutingID(), page_seq_no, item_url));
   OnMessageReceived(*message);
 
   EXPECT_CALL(*mock_delegate(), OnUndoMostVisitedDeletion(item_url)).Times(0);
   EXPECT_CALL(*policy, ShouldProcessUndoMostVisitedDeletion()).Times(0);
   message.reset(new ChromeViewHostMsg_SearchBoxUndoMostVisitedDeletion(
-      contents->GetRoutingID(), invalid_page_id, item_url));
+      contents->GetRoutingID(), page_seq_no, item_url));
   OnMessageReceived(*message);
 
   EXPECT_CALL(*mock_delegate(), OnUndoAllMostVisitedDeletions()).Times(0);
   EXPECT_CALL(*policy, ShouldProcessUndoAllMostVisitedDeletions()).Times(0);
   message.reset(new ChromeViewHostMsg_SearchBoxUndoAllMostVisitedDeletions(
-      contents->GetRoutingID(), invalid_page_id));
+      contents->GetRoutingID(), page_seq_no));
   OnMessageReceived(*message);
 
   EXPECT_CALL(*mock_delegate(), FocusOmnibox(OMNIBOX_FOCUS_VISIBLE)).Times(0);
   EXPECT_CALL(*policy, ShouldProcessFocusOmnibox(is_active_tab)).Times(0);
   message.reset(new ChromeViewHostMsg_FocusOmnibox(
-      contents->GetRoutingID(), invalid_page_id, OMNIBOX_FOCUS_VISIBLE));
+      contents->GetRoutingID(), page_seq_no,
+      OMNIBOX_FOCUS_VISIBLE));
   OnMessageReceived(*message);
 
   EXPECT_CALL(*mock_delegate(), OnLogEvent(NTP_MOUSEOVER)).Times(0);
   EXPECT_CALL(*policy, ShouldProcessLogEvent()).Times(0);
   message.reset(new ChromeViewHostMsg_LogEvent(contents->GetRoutingID(),
-                                               invalid_page_id, NTP_MOUSEOVER));
+                                               page_seq_no,
+                                               NTP_MOUSEOVER));
   OnMessageReceived(*message);
 
   base::string16 text;
   EXPECT_CALL(*mock_delegate(), PasteIntoOmnibox(text)).Times(0);
   EXPECT_CALL(*policy, ShouldProcessPasteIntoOmnibox(is_active_tab)).Times(0);
   message.reset(new ChromeViewHostMsg_PasteAndOpenDropdown(
-      contents->GetRoutingID(), invalid_page_id, text));
+      contents->GetRoutingID(), page_seq_no, text));
   OnMessageReceived(*message);
 }
 
 TEST_F(SearchIPCRouterTest, ProcessPasteAndOpenDropdownMsg) {
   NavigateAndCommitActiveTab(GURL(chrome::kChromeSearchLocalNtpUrl));
   SetupMockDelegateAndPolicy();
   MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
 
   content::WebContents* contents = web_contents();
   bool is_active_tab = IsActiveTab(contents);
   EXPECT_TRUE(is_active_tab);
 
   base::string16 text;
   EXPECT_CALL(*mock_delegate(), PasteIntoOmnibox(text)).Times(1);
   EXPECT_CALL(*policy, ShouldProcessPasteIntoOmnibox(is_active_tab)).Times(1)
       .WillOnce(testing::Return(true));
   scoped_ptr<IPC::Message> message(new ChromeViewHostMsg_PasteAndOpenDropdown(
-      contents->GetRoutingID(),
-      contents->GetController().GetVisibleEntry()->GetPageID(), text));
+      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(), text));
   OnMessageReceived(*message);
 }
 
 TEST_F(SearchIPCRouterTest, IgnorePasteAndOpenDropdownMsg) {
   NavigateAndCommitActiveTab(GURL("chrome-search://foo/bar"));
   SetupMockDelegateAndPolicy();
   base::string16 text;
   EXPECT_CALL(*mock_delegate(), PasteIntoOmnibox(text)).Times(0);
 
   content::WebContents* contents = web_contents();
   bool is_active_tab = IsActiveTab(contents);
   EXPECT_TRUE(is_active_tab);
 
   MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
   EXPECT_CALL(*policy, ShouldProcessPasteIntoOmnibox(is_active_tab)).Times(1)
       .WillOnce(testing::Return(false));
 
   scoped_ptr<IPC::Message> message(new ChromeViewHostMsg_PasteAndOpenDropdown(
-      contents->GetRoutingID(),
-      contents->GetController().GetVisibleEntry()->GetPageID(), text));
+      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(), text));
   OnMessageReceived(*message);
 }
 
 TEST_F(SearchIPCRouterTest, SendSetPromoInformationMsg) {
   NavigateAndCommitActiveTab(GURL("chrome-search://foo/bar"));
   SetupMockDelegateAndPolicy();
   MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
   EXPECT_CALL(*policy, ShouldSendSetPromoInformation()).Times(1)
       .WillOnce(testing::Return(true));
 
@@ skipping 280 matching lines @@
   NavigateAndCommitActiveTab(GURL("chrome-search://foo/bar"));
   SetupMockDelegateAndPolicy();
   MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
   EXPECT_CALL(*policy, ShouldSendToggleVoiceSearch()).Times(1)
       .WillOnce(testing::Return(false));
 
   process()->sink().ClearMessages();
   GetSearchIPCRouter().ToggleVoiceSearch();
   EXPECT_FALSE(MessageWasSent(ChromeViewMsg_SearchBoxToggleVoiceSearch::ID));
 }