Convert instant search messages to Mojo

chrome/browser/ui/search/search_ipc_router_unittest.cc

Index: chrome/browser/ui/search/search_ipc_router_unittest.cc
diff --git a/chrome/browser/ui/search/search_ipc_router_unittest.cc b/chrome/browser/ui/search/search_ipc_router_unittest.cc
index 53319317d57112d83ccb13ae24ad9311ff392ba2..544cbaf962ec0a71af0ae4d8c1c87b782693f69e 100644
--- a/chrome/browser/ui/search/search_ipc_router_unittest.cc
+++ b/chrome/browser/ui/search/search_ipc_router_unittest.cc
@@ -24,6 +24,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/search/instant_types.h"
+#include "chrome/common/search/mock_searchbox.h"
 #include "chrome/common/search/ntp_logging_events.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
@@ -42,6 +43,9 @@
 #include "ui/base/window_open_disposition.h"
 #include "url/gurl.h"
 
+using testing::_;
+using testing::Return;
+
 namespace {
 
 class MockSearchIPCRouterDelegate : public SearchIPCRouter::Delegate {
@@ -84,6 +88,12 @@ class MockSearchIPCRouterPolicy : public SearchIPCRouter::Policy {
   MOCK_METHOD0(ShouldSubmitQuery, bool());
 };
 
+class MockSearchBoxClientFactory
+    : public SearchIPCRouter::SearchBoxClientFactory {
+ public:
+  MOCK_METHOD0(GetSearchBox, chrome::mojom::SearchBox*(void));

[Marc Treib, 2016/10/13 09:04:50]

nit: Like in the other test, a simple fake would do.

[tibell, 2016/10/13 23:29:44]

Acknowledged.

+};
+
 }  // namespace
 
 class SearchIPCRouterTest : public BrowserWithTestWindowTest {
@@ -113,18 +123,12 @@ class SearchIPCRouterTest : public BrowserWithTestWindowTest {
     TemplateURL* template_url =
         template_url_service->Add(base::MakeUnique<TemplateURL>(data));
     template_url_service->SetUserSelectedDefaultSearchProvider(template_url);
-    process()->sink().ClearMessages();
   }
 
   content::WebContents* web_contents() {
     return browser()->tab_strip_model()->GetActiveWebContents();
   }
 
-  content::MockRenderProcessHost* process() {
-    return static_cast<content::MockRenderProcessHost*>(
-        web_contents()->GetRenderViewHost()->GetProcess());
-  }
-
   SearchTabHelper* GetSearchTabHelper(
       content::WebContents* web_contents) {
     EXPECT_NE(static_cast<content::WebContents*>(NULL), web_contents);
@@ -139,10 +143,10 @@ class SearchIPCRouterTest : public BrowserWithTestWindowTest {
     search_tab_helper->ipc_router().set_delegate_for_testing(mock_delegate());
     search_tab_helper->ipc_router().set_policy_for_testing(
         base::WrapUnique(new MockSearchIPCRouterPolicy));
-  }
-
-  bool MessageWasSent(uint32_t id) {
-    return process()->sink().GetFirstMessageMatching(id) != NULL;
+    auto factory = base::MakeUnique<MockSearchBoxClientFactory>();
+    ON_CALL(*factory, GetSearchBox()).WillByDefault(Return(&mock_search_box_));
+    GetSearchIPCRouter().set_search_box_client_factory_for_testing(
+        std::move(factory));
   }
 
   MockSearchIPCRouterDelegate* mock_delegate() { return &delegate_; }
@@ -164,24 +168,16 @@ class SearchIPCRouterTest : public BrowserWithTestWindowTest {
     return GetSearchIPCRouter().page_seq_no_for_testing();
   }
 
-  void OnMessageReceived(const IPC::Message& message) {
-    bool should_handle_message =
-        search::IsRenderedInInstantProcess(web_contents(), profile());
-    bool handled = GetSearchIPCRouter().OnMessageReceived(message);
-    ASSERT_EQ(should_handle_message, handled);
-  }
-
-  bool OnSpuriousMessageReceived(const IPC::Message& message) {
-    return GetSearchIPCRouter().OnMessageReceived(message);
-  }
-
   bool IsActiveTab(content::WebContents* contents) {
     return GetSearchTabHelper(contents)->ipc_router().is_active_tab_;
   }
 
+  MockSearchBox* mock_search_box() { return &mock_search_box_; }
+
  private:
   MockSearchIPCRouterDelegate delegate_;
   base::FieldTrialList field_trial_list_;
+  MockSearchBox mock_search_box_;
 };
 
 TEST_F(SearchIPCRouterTest, IgnoreMessagesFromNonInstantRenderers) {
@@ -195,9 +191,8 @@ TEST_F(SearchIPCRouterTest, IgnoreMessagesFromNonInstantRenderers) {
   MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
   EXPECT_CALL(*policy, ShouldProcessFocusOmnibox(is_active_tab)).Times(0);
 
-  OnMessageReceived(ChromeViewHostMsg_FocusOmnibox(
-      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(),
-      OMNIBOX_FOCUS_VISIBLE));
+  GetSearchIPCRouter().FocusOmnibox(GetSearchIPCRouterSeqNo(),
+                                    OMNIBOX_FOCUS_VISIBLE);
 }
 
 TEST_F(SearchIPCRouterTest, ProcessFocusOmniboxMsg) {
@@ -212,9 +207,8 @@ TEST_F(SearchIPCRouterTest, ProcessFocusOmniboxMsg) {
   EXPECT_CALL(*policy, ShouldProcessFocusOmnibox(is_active_tab)).Times(1)
       .WillOnce(testing::Return(true));
 
-  OnMessageReceived(ChromeViewHostMsg_FocusOmnibox(
-      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(),
-      OMNIBOX_FOCUS_VISIBLE));
+  GetSearchIPCRouter().FocusOmnibox(GetSearchIPCRouterSeqNo(),
+                                    OMNIBOX_FOCUS_VISIBLE);
 }
 
 TEST_F(SearchIPCRouterTest, IgnoreFocusOmniboxMsg) {
@@ -229,9 +223,8 @@ TEST_F(SearchIPCRouterTest, IgnoreFocusOmniboxMsg) {
   EXPECT_CALL(*policy, ShouldProcessFocusOmnibox(is_active_tab)).Times(1)
       .WillOnce(testing::Return(false));
 
-  OnMessageReceived(ChromeViewHostMsg_FocusOmnibox(
-      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(),
-      OMNIBOX_FOCUS_VISIBLE));
+  GetSearchIPCRouter().FocusOmnibox(GetSearchIPCRouterSeqNo(),
+                                    OMNIBOX_FOCUS_VISIBLE);
 }
 
 TEST_F(SearchIPCRouterTest, HandleTabChangedEvents) {
@@ -263,10 +256,7 @@ TEST_F(SearchIPCRouterTest, ProcessLogEventMsg) {
   EXPECT_CALL(*policy, ShouldProcessLogEvent()).Times(1)
       .WillOnce(testing::Return(true));
 
-  content::WebContents* contents = web_contents();
-  OnMessageReceived(ChromeViewHostMsg_LogEvent(
-      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(),
-      NTP_TILE, delta));
+  GetSearchIPCRouter().LogEvent(GetSearchIPCRouterSeqNo(), NTP_TILE, delta);
 }
 
 TEST_F(SearchIPCRouterTest, IgnoreLogEventMsg) {
@@ -278,10 +268,7 @@ TEST_F(SearchIPCRouterTest, IgnoreLogEventMsg) {
   EXPECT_CALL(*policy, ShouldProcessLogEvent()).Times(1)
       .WillOnce(testing::Return(false));
 
-  content::WebContents* contents = web_contents();
-  OnMessageReceived(ChromeViewHostMsg_LogEvent(
-      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(),
-      NTP_TILE, delta));
+  GetSearchIPCRouter().LogEvent(GetSearchIPCRouterSeqNo(), NTP_TILE, delta);
 }
 
 TEST_F(SearchIPCRouterTest, ProcessLogMostVisitedImpressionMsg) {
@@ -293,10 +280,8 @@ TEST_F(SearchIPCRouterTest, ProcessLogMostVisitedImpressionMsg) {
   EXPECT_CALL(*policy, ShouldProcessLogEvent()).Times(1)
       .WillOnce(testing::Return(true));
 
-  content::WebContents* contents = web_contents();
-  OnMessageReceived(ChromeViewHostMsg_LogMostVisitedImpression(
-      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(), 3,
-      NTPLoggingTileSource::SERVER));
+  GetSearchIPCRouter().LogMostVisitedImpression(GetSearchIPCRouterSeqNo(), 3,
+                                                NTPLoggingTileSource::SERVER);
 }
 
 TEST_F(SearchIPCRouterTest, ProcessLogMostVisitedNavigationMsg) {
@@ -308,10 +293,8 @@ TEST_F(SearchIPCRouterTest, ProcessLogMostVisitedNavigationMsg) {
   EXPECT_CALL(*policy, ShouldProcessLogEvent()).Times(1)
       .WillOnce(testing::Return(true));
 
-  content::WebContents* contents = web_contents();
-  OnMessageReceived(ChromeViewHostMsg_LogMostVisitedNavigation(
-      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(), 3,
-      NTPLoggingTileSource::SERVER));
+  GetSearchIPCRouter().LogMostVisitedNavigation(GetSearchIPCRouterSeqNo(), 3,
+                                                NTPLoggingTileSource::SERVER);
 }
 
 TEST_F(SearchIPCRouterTest, ProcessChromeIdentityCheckMsg) {
@@ -323,9 +306,8 @@ TEST_F(SearchIPCRouterTest, ProcessChromeIdentityCheckMsg) {
   EXPECT_CALL(*policy, ShouldProcessChromeIdentityCheck()).Times(1)
       .WillOnce(testing::Return(true));
 
-  content::WebContents* contents = web_contents();
-  OnMessageReceived(ChromeViewHostMsg_ChromeIdentityCheck(
-      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(), test_identity));
+  GetSearchIPCRouter().ChromeIdentityCheck(GetSearchIPCRouterSeqNo(),
+                                           test_identity);
 }
 
 TEST_F(SearchIPCRouterTest, IgnoreChromeIdentityCheckMsg) {
@@ -338,9 +320,8 @@ TEST_F(SearchIPCRouterTest, IgnoreChromeIdentityCheckMsg) {
   EXPECT_CALL(*policy, ShouldProcessChromeIdentityCheck()).Times(1)
       .WillOnce(testing::Return(false));
 
-  content::WebContents* contents = web_contents();
-  OnMessageReceived(ChromeViewHostMsg_ChromeIdentityCheck(
-      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(), test_identity));
+  GetSearchIPCRouter().ChromeIdentityCheck(GetSearchIPCRouterSeqNo(),
+                                           test_identity);
 }
 
 TEST_F(SearchIPCRouterTest, ProcessHistorySyncCheckMsg) {
@@ -351,9 +332,7 @@ TEST_F(SearchIPCRouterTest, ProcessHistorySyncCheckMsg) {
   EXPECT_CALL(*policy, ShouldProcessHistorySyncCheck()).Times(1)
       .WillOnce(testing::Return(true));
 
-  content::WebContents* contents = web_contents();
-  OnMessageReceived(ChromeViewHostMsg_HistorySyncCheck(
-      contents->GetRoutingID(), GetSearchIPCRouterSeqNo()));
+  GetSearchIPCRouter().HistorySyncCheck(GetSearchIPCRouterSeqNo());
 }
 
 TEST_F(SearchIPCRouterTest, IgnoreHistorySyncCheckMsg) {
@@ -365,9 +344,7 @@ TEST_F(SearchIPCRouterTest, IgnoreHistorySyncCheckMsg) {
   EXPECT_CALL(*policy, ShouldProcessHistorySyncCheck()).Times(1)
       .WillOnce(testing::Return(false));
 
-  content::WebContents* contents = web_contents();
-  OnMessageReceived(ChromeViewHostMsg_HistorySyncCheck(
-      contents->GetRoutingID(), GetSearchIPCRouterSeqNo()));
+  GetSearchIPCRouter().HistorySyncCheck(GetSearchIPCRouterSeqNo());
 }
 
 TEST_F(SearchIPCRouterTest, ProcessDeleteMostVisitedItemMsg) {
@@ -379,9 +356,8 @@ TEST_F(SearchIPCRouterTest, ProcessDeleteMostVisitedItemMsg) {
   EXPECT_CALL(*policy, ShouldProcessDeleteMostVisitedItem()).Times(1)
       .WillOnce(testing::Return(true));
 
-  content::WebContents* contents = web_contents();
-  OnMessageReceived(ChromeViewHostMsg_SearchBoxDeleteMostVisitedItem(
-      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(), item_url));
+  GetSearchIPCRouter().SearchBoxDeleteMostVisitedItem(GetSearchIPCRouterSeqNo(),
+                                                      item_url);
 }
 
 TEST_F(SearchIPCRouterTest, IgnoreDeleteMostVisitedItemMsg) {
@@ -393,9 +369,8 @@ TEST_F(SearchIPCRouterTest, IgnoreDeleteMostVisitedItemMsg) {
   EXPECT_CALL(*policy, ShouldProcessDeleteMostVisitedItem()).Times(1)
       .WillOnce(testing::Return(false));
 
-  content::WebContents* contents = web_contents();
-  OnMessageReceived(ChromeViewHostMsg_SearchBoxDeleteMostVisitedItem(
-      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(), item_url));
+  GetSearchIPCRouter().SearchBoxDeleteMostVisitedItem(GetSearchIPCRouterSeqNo(),
+                                                      item_url);
 }
 
 TEST_F(SearchIPCRouterTest, ProcessUndoMostVisitedDeletionMsg) {
@@ -407,9 +382,8 @@ TEST_F(SearchIPCRouterTest, ProcessUndoMostVisitedDeletionMsg) {
   EXPECT_CALL(*policy, ShouldProcessUndoMostVisitedDeletion()).Times(1)
       .WillOnce(testing::Return(true));
 
-  content::WebContents* contents = web_contents();
-  OnMessageReceived(ChromeViewHostMsg_SearchBoxUndoMostVisitedDeletion(
-      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(), item_url));
+  GetSearchIPCRouter().SearchBoxUndoMostVisitedDeletion(
+      GetSearchIPCRouterSeqNo(), item_url);
 }
 
 TEST_F(SearchIPCRouterTest, IgnoreUndoMostVisitedDeletionMsg) {
@@ -421,9 +395,8 @@ TEST_F(SearchIPCRouterTest, IgnoreUndoMostVisitedDeletionMsg) {
   EXPECT_CALL(*policy, ShouldProcessUndoMostVisitedDeletion()).Times(1)
       .WillOnce(testing::Return(false));
 
-  content::WebContents* contents = web_contents();
-  OnMessageReceived(ChromeViewHostMsg_SearchBoxUndoMostVisitedDeletion(
-      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(), item_url));
+  GetSearchIPCRouter().SearchBoxUndoMostVisitedDeletion(
+      GetSearchIPCRouterSeqNo(), item_url);
 }
 
 TEST_F(SearchIPCRouterTest, ProcessUndoAllMostVisitedDeletionsMsg) {
@@ -434,9 +407,8 @@ TEST_F(SearchIPCRouterTest, ProcessUndoAllMostVisitedDeletionsMsg) {
   EXPECT_CALL(*policy, ShouldProcessUndoAllMostVisitedDeletions()).Times(1)
       .WillOnce(testing::Return(true));
 
-  content::WebContents* contents = web_contents();
-  OnMessageReceived(ChromeViewHostMsg_SearchBoxUndoAllMostVisitedDeletions(
-      contents->GetRoutingID(), GetSearchIPCRouterSeqNo()));
+  GetSearchIPCRouter().SearchBoxUndoAllMostVisitedDeletions(
+      GetSearchIPCRouterSeqNo());
 }
 
 TEST_F(SearchIPCRouterTest, IgnoreUndoAllMostVisitedDeletionsMsg) {
@@ -447,9 +419,8 @@ TEST_F(SearchIPCRouterTest, IgnoreUndoAllMostVisitedDeletionsMsg) {
   EXPECT_CALL(*policy, ShouldProcessUndoAllMostVisitedDeletions()).Times(1)
       .WillOnce(testing::Return(false));
 
-  content::WebContents* contents = web_contents();
-  OnMessageReceived(ChromeViewHostMsg_SearchBoxUndoAllMostVisitedDeletions(
-      contents->GetRoutingID(), GetSearchIPCRouterSeqNo()));
+  GetSearchIPCRouter().SearchBoxUndoAllMostVisitedDeletions(
+      GetSearchIPCRouterSeqNo());
 }
 
 TEST_F(SearchIPCRouterTest, IgnoreMessageIfThePageIsNotActive) {
@@ -467,36 +438,29 @@ TEST_F(SearchIPCRouterTest, IgnoreMessageIfThePageIsNotActive) {
 
   EXPECT_CALL(*mock_delegate(), OnDeleteMostVisitedItem(item_url)).Times(0);
   EXPECT_CALL(*policy, ShouldProcessDeleteMostVisitedItem()).Times(0);
-  OnMessageReceived(ChromeViewHostMsg_SearchBoxDeleteMostVisitedItem(
-      contents->GetRoutingID(), page_seq_no, item_url));
+  GetSearchIPCRouter().SearchBoxDeleteMostVisitedItem(page_seq_no, item_url);
 
   EXPECT_CALL(*mock_delegate(), OnUndoMostVisitedDeletion(item_url)).Times(0);
   EXPECT_CALL(*policy, ShouldProcessUndoMostVisitedDeletion()).Times(0);
-  OnMessageReceived(ChromeViewHostMsg_SearchBoxUndoMostVisitedDeletion(
-      contents->GetRoutingID(), page_seq_no, item_url));
+  GetSearchIPCRouter().SearchBoxUndoMostVisitedDeletion(page_seq_no, item_url);
 
   EXPECT_CALL(*mock_delegate(), OnUndoAllMostVisitedDeletions()).Times(0);
   EXPECT_CALL(*policy, ShouldProcessUndoAllMostVisitedDeletions()).Times(0);
-  OnMessageReceived(ChromeViewHostMsg_SearchBoxUndoAllMostVisitedDeletions(
-      contents->GetRoutingID(), page_seq_no));
+  GetSearchIPCRouter().SearchBoxUndoAllMostVisitedDeletions(page_seq_no);
 
   EXPECT_CALL(*mock_delegate(), FocusOmnibox(OMNIBOX_FOCUS_VISIBLE)).Times(0);
   EXPECT_CALL(*policy, ShouldProcessFocusOmnibox(is_active_tab)).Times(0);
-  OnMessageReceived(ChromeViewHostMsg_FocusOmnibox(
-      contents->GetRoutingID(), page_seq_no, OMNIBOX_FOCUS_VISIBLE));
+  GetSearchIPCRouter().FocusOmnibox(page_seq_no, OMNIBOX_FOCUS_VISIBLE);
 
   base::TimeDelta delta = base::TimeDelta::FromMilliseconds(123);
   EXPECT_CALL(*mock_delegate(), OnLogEvent(NTP_TILE, delta)).Times(0);
   EXPECT_CALL(*policy, ShouldProcessLogEvent()).Times(0);
-  OnMessageReceived(ChromeViewHostMsg_LogEvent(contents->GetRoutingID(),
-                                               page_seq_no,
-                                               NTP_TILE, delta));
+  GetSearchIPCRouter().LogEvent(page_seq_no, NTP_TILE, delta);
 
   base::string16 text;
   EXPECT_CALL(*mock_delegate(), PasteIntoOmnibox(text)).Times(0);
   EXPECT_CALL(*policy, ShouldProcessPasteIntoOmnibox(is_active_tab)).Times(0);
-  OnMessageReceived(ChromeViewHostMsg_PasteAndOpenDropdown(
-      contents->GetRoutingID(), page_seq_no, text));
+  GetSearchIPCRouter().PasteAndOpenDropdown(page_seq_no, text);
 }
 
 TEST_F(SearchIPCRouterTest, ProcessPasteAndOpenDropdownMsg) {
@@ -512,8 +476,7 @@ TEST_F(SearchIPCRouterTest, ProcessPasteAndOpenDropdownMsg) {
   EXPECT_CALL(*mock_delegate(), PasteIntoOmnibox(text)).Times(1);
   EXPECT_CALL(*policy, ShouldProcessPasteIntoOmnibox(is_active_tab)).Times(1)
       .WillOnce(testing::Return(true));
-  OnMessageReceived(ChromeViewHostMsg_PasteAndOpenDropdown(
-      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(), text));
+  GetSearchIPCRouter().PasteAndOpenDropdown(GetSearchIPCRouterSeqNo(), text);
 }
 
 TEST_F(SearchIPCRouterTest, IgnorePasteAndOpenDropdownMsg) {
@@ -530,8 +493,7 @@ TEST_F(SearchIPCRouterTest, IgnorePasteAndOpenDropdownMsg) {
   EXPECT_CALL(*policy, ShouldProcessPasteIntoOmnibox(is_active_tab)).Times(1)
       .WillOnce(testing::Return(false));
 
-  OnMessageReceived(ChromeViewHostMsg_PasteAndOpenDropdown(
-      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(), text));
+  GetSearchIPCRouter().PasteAndOpenDropdown(GetSearchIPCRouterSeqNo(), text);
 }
 
 TEST_F(SearchIPCRouterTest, SendSetSuggestionToPrefetch) {
@@ -541,11 +503,9 @@ TEST_F(SearchIPCRouterTest, SendSetSuggestionToPrefetch) {
   EXPECT_CALL(*policy, ShouldSendSetSuggestionToPrefetch()).Times(1)
       .WillOnce(testing::Return(true));
 
-  process()->sink().ClearMessages();
   content::WebContents* contents = web_contents();
+  EXPECT_CALL(*mock_search_box(), SetSuggestionToPrefetch(_));
   GetSearchTabHelper(contents)->SetSuggestionToPrefetch(InstantSuggestion());
-  EXPECT_TRUE(MessageWasSent(
-      ChromeViewMsg_SearchBoxSetSuggestionToPrefetch::ID));
 }
 
 TEST_F(SearchIPCRouterTest, DoNotSendSetSuggestionToPrefetch) {
@@ -555,11 +515,9 @@ TEST_F(SearchIPCRouterTest, DoNotSendSetSuggestionToPrefetch) {
   EXPECT_CALL(*policy, ShouldSendSetSuggestionToPrefetch()).Times(1)
       .WillOnce(testing::Return(false));
 
-  process()->sink().ClearMessages();
   content::WebContents* contents = web_contents();
+  EXPECT_CALL(*mock_search_box(), SetSuggestionToPrefetch(_)).Times(0);
   GetSearchTabHelper(contents)->SetSuggestionToPrefetch(InstantSuggestion());
-  EXPECT_FALSE(MessageWasSent(
-      ChromeViewMsg_SearchBoxSetSuggestionToPrefetch::ID));
 }
 
 TEST_F(SearchIPCRouterTest, SendOmniboxFocusChange) {
@@ -569,10 +527,9 @@ TEST_F(SearchIPCRouterTest, SendOmniboxFocusChange) {
   EXPECT_CALL(*policy, ShouldSendOmniboxFocusChanged()).Times(1)
       .WillOnce(testing::Return(true));
 
-  process()->sink().ClearMessages();
+  EXPECT_CALL(*mock_search_box(), FocusChanged(_, _));
   GetSearchIPCRouter().OmniboxFocusChanged(OMNIBOX_FOCUS_NONE,
                                            OMNIBOX_FOCUS_CHANGE_EXPLICIT);
-  EXPECT_TRUE(MessageWasSent(ChromeViewMsg_SearchBoxFocusChanged::ID));
 }
 
 TEST_F(SearchIPCRouterTest, DoNotSendOmniboxFocusChange) {
@@ -582,10 +539,9 @@ TEST_F(SearchIPCRouterTest, DoNotSendOmniboxFocusChange) {
   EXPECT_CALL(*policy, ShouldSendOmniboxFocusChanged()).Times(1)
       .WillOnce(testing::Return(false));
 
-  process()->sink().ClearMessages();
+  EXPECT_CALL(*mock_search_box(), FocusChanged(_, _)).Times(0);
   GetSearchIPCRouter().OmniboxFocusChanged(OMNIBOX_FOCUS_NONE,
                                            OMNIBOX_FOCUS_CHANGE_EXPLICIT);
-  EXPECT_FALSE(MessageWasSent(ChromeViewMsg_SearchBoxFocusChanged::ID));
 }
 
 TEST_F(SearchIPCRouterTest, SendSetInputInProgress) {
@@ -595,9 +551,8 @@ TEST_F(SearchIPCRouterTest, SendSetInputInProgress) {
   EXPECT_CALL(*policy, ShouldSendSetInputInProgress(true)).Times(1)
       .WillOnce(testing::Return(true));
 
-  process()->sink().ClearMessages();
+  EXPECT_CALL(*mock_search_box(), SetInputInProgress(_));
   GetSearchIPCRouter().SetInputInProgress(true);
-  EXPECT_TRUE(MessageWasSent(ChromeViewMsg_SearchBoxSetInputInProgress::ID));
 }
 
 TEST_F(SearchIPCRouterTest, DoNotSendSetInputInProgress) {
@@ -607,9 +562,8 @@ TEST_F(SearchIPCRouterTest, DoNotSendSetInputInProgress) {
   EXPECT_CALL(*policy, ShouldSendSetInputInProgress(true)).Times(1)
       .WillOnce(testing::Return(false));
 
-  process()->sink().ClearMessages();
+  EXPECT_CALL(*mock_search_box(), SetInputInProgress(_)).Times(0);
   GetSearchIPCRouter().SetInputInProgress(true);
-  EXPECT_FALSE(MessageWasSent(ChromeViewMsg_SearchBoxSetInputInProgress::ID));
 }
 
 TEST_F(SearchIPCRouterTest, SendMostVisitedItemsMsg) {
@@ -619,11 +573,9 @@ TEST_F(SearchIPCRouterTest, SendMostVisitedItemsMsg) {
   EXPECT_CALL(*policy, ShouldSendMostVisitedItems()).Times(1)
       .WillOnce(testing::Return(true));
 
-  process()->sink().ClearMessages();
+  EXPECT_CALL(*mock_search_box(), MostVisitedChanged(_));
   GetSearchIPCRouter().SendMostVisitedItems(
       std::vector<InstantMostVisitedItem>());
-  EXPECT_TRUE(MessageWasSent(
-      ChromeViewMsg_SearchBoxMostVisitedItemsChanged::ID));
 }
 
 TEST_F(SearchIPCRouterTest, DoNotSendMostVisitedItemsMsg) {
@@ -633,11 +585,9 @@ TEST_F(SearchIPCRouterTest, DoNotSendMostVisitedItemsMsg) {
   EXPECT_CALL(*policy, ShouldSendMostVisitedItems()).Times(1)
       .WillOnce(testing::Return(false));
 
-  process()->sink().ClearMessages();
+  EXPECT_CALL(*mock_search_box(), MostVisitedChanged(_)).Times(0);
   GetSearchIPCRouter().SendMostVisitedItems(
       std::vector<InstantMostVisitedItem>());
-  EXPECT_FALSE(MessageWasSent(
-      ChromeViewMsg_SearchBoxMostVisitedItemsChanged::ID));
 }
 
 TEST_F(SearchIPCRouterTest, SendThemeBackgroundInfoMsg) {
@@ -647,9 +597,8 @@ TEST_F(SearchIPCRouterTest, SendThemeBackgroundInfoMsg) {
   EXPECT_CALL(*policy, ShouldSendThemeBackgroundInfo()).Times(1)
       .WillOnce(testing::Return(true));
 
-  process()->sink().ClearMessages();
+  EXPECT_CALL(*mock_search_box(), ThemeChanged(_));
   GetSearchIPCRouter().SendThemeBackgroundInfo(ThemeBackgroundInfo());
-  EXPECT_TRUE(MessageWasSent(ChromeViewMsg_SearchBoxThemeChanged::ID));
 }
 
 TEST_F(SearchIPCRouterTest, DoNotSendThemeBackgroundInfoMsg) {
@@ -659,9 +608,8 @@ TEST_F(SearchIPCRouterTest, DoNotSendThemeBackgroundInfoMsg) {
   EXPECT_CALL(*policy, ShouldSendThemeBackgroundInfo()).Times(1)
       .WillOnce(testing::Return(false));
 
-  process()->sink().ClearMessages();
+  EXPECT_CALL(*mock_search_box(), ThemeChanged(_)).Times(0);
   GetSearchIPCRouter().SendThemeBackgroundInfo(ThemeBackgroundInfo());
-  EXPECT_FALSE(MessageWasSent(ChromeViewMsg_SearchBoxThemeChanged::ID));
 }
 
 TEST_F(SearchIPCRouterTest, SendSubmitMsg) {
@@ -671,9 +619,8 @@ TEST_F(SearchIPCRouterTest, SendSubmitMsg) {
   EXPECT_CALL(*policy, ShouldSubmitQuery()).Times(1)
       .WillOnce(testing::Return(true));
 
-  process()->sink().ClearMessages();
+  EXPECT_CALL(*mock_search_box(), Submit(_, _));
   GetSearchIPCRouter().Submit(base::string16(), EmbeddedSearchRequestParams());
-  EXPECT_TRUE(MessageWasSent(ChromeViewMsg_SearchBoxSubmit::ID));
 }
 
 TEST_F(SearchIPCRouterTest, DoNotSendSubmitMsg) {
@@ -683,22 +630,6 @@ TEST_F(SearchIPCRouterTest, DoNotSendSubmitMsg) {
   EXPECT_CALL(*policy, ShouldSubmitQuery()).Times(1)
       .WillOnce(testing::Return(false));
 
-  process()->sink().ClearMessages();
+  EXPECT_CALL(*mock_search_box(), Submit(_, _)).Times(0);
   GetSearchIPCRouter().Submit(base::string16(), EmbeddedSearchRequestParams());
-  EXPECT_FALSE(MessageWasSent(ChromeViewMsg_SearchBoxSubmit::ID));
-}
-
-TEST_F(SearchIPCRouterTest, SpuriousMessageTypesIgnored) {
-  NavigateAndCommitActiveTab(GURL("chrome-search://foo/bar"));
-  SetupMockDelegateAndPolicy();
-  const int routing_id = web_contents()->GetRoutingID();
-
-  // Construct a series of synthetic messages for each valid IPC message type,
-  // ensuring the router ignores them all.
-  for (int i = 0; i < LastIPCMsgStart; ++i) {
-    const int message_id = i << 16;
-    ASSERT_EQ(IPC_MESSAGE_ID_CLASS(message_id), i);
-    IPC::Message msg(routing_id, message_id, IPC::Message::PRIORITY_LOW);
-    EXPECT_FALSE(OnSpuriousMessageReceived(msg)) << i;
-  }
 }