Separate checking the user identity and checking if the user is syncing his history in two differen…

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 40 matching lines @@
   MOCK_METHOD1(OnDeleteMostVisitedItem, void(const GURL& url));
   MOCK_METHOD1(OnUndoMostVisitedDeletion, void(const GURL& url));
   MOCK_METHOD0(OnUndoAllMostVisitedDeletions, void());
   MOCK_METHOD1(OnLogEvent, void(NTPLoggingEventType event));
   MOCK_METHOD2(OnLogMostVisitedImpression,
                void(int position, const base::string16& provider));
   MOCK_METHOD2(OnLogMostVisitedNavigation,
                void(int position, const base::string16& provider));
   MOCK_METHOD1(PasteIntoOmnibox, void(const base::string16&));
   MOCK_METHOD1(OnChromeIdentityCheck, void(const base::string16& identity));
+  MOCK_METHOD0(OnHistorySyncCheck, void());
 };
 
 class MockSearchIPCRouterPolicy : public SearchIPCRouter::Policy {
  public:
   virtual ~MockSearchIPCRouterPolicy() {}
 
   MOCK_METHOD0(ShouldProcessSetVoiceSearchSupport, bool());
   MOCK_METHOD1(ShouldProcessFocusOmnibox, bool(bool));
   MOCK_METHOD1(ShouldProcessNavigateToURL, bool(bool));
   MOCK_METHOD0(ShouldProcessDeleteMostVisitedItem, bool());
   MOCK_METHOD0(ShouldProcessUndoMostVisitedDeletion, bool());
   MOCK_METHOD0(ShouldProcessUndoAllMostVisitedDeletions, bool());
   MOCK_METHOD0(ShouldProcessLogEvent, bool());
   MOCK_METHOD1(ShouldProcessPasteIntoOmnibox, bool(bool));
   MOCK_METHOD0(ShouldProcessChromeIdentityCheck, bool());
+  MOCK_METHOD0(ShouldProcessHistorySyncCheck, bool());
   MOCK_METHOD0(ShouldSendSetPromoInformation, bool());
   MOCK_METHOD0(ShouldSendSetDisplayInstantResults, bool());
   MOCK_METHOD0(ShouldSendSetSuggestionToPrefetch, bool());
   MOCK_METHOD0(ShouldSendSetOmniboxStartMargin, bool());
   MOCK_METHOD1(ShouldSendSetInputInProgress, bool(bool));
   MOCK_METHOD0(ShouldSendOmniboxFocusChanged, bool());
   MOCK_METHOD0(ShouldSendMostVisitedItems, bool());
   MOCK_METHOD0(ShouldSendThemeBackgroundInfo, bool());
   MOCK_METHOD0(ShouldSendToggleVoiceSearch, bool());
   MOCK_METHOD0(ShouldSubmitQuery, bool());
@@ skipping 118 matching lines @@
   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(0);
 
-  scoped_ptr<IPC::Message> message(new ChromeViewHostMsg_SearchBoxNavigate(
-      contents->GetRoutingID(),
-      GetSearchIPCRouterSeqNo(),
-      destination_url, CURRENT_TAB, true));
-  OnMessageReceived(*message);
+  OnMessageReceived(ChromeViewHostMsg_SearchBoxNavigate(
+      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(), destination_url,
+      CURRENT_TAB, true));
 }
 
 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(), GetSearchIPCRouterSeqNo(), true));
-  OnMessageReceived(*message);
+  OnMessageReceived(ChromeViewHostMsg_SetVoiceSearchSupported(
+      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(), true));
 }
 
 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(), GetSearchIPCRouterSeqNo(), true));
-  OnMessageReceived(*message);
+  OnMessageReceived(ChromeViewHostMsg_SetVoiceSearchSupported(
+      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(), true));
 }
 
 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(),
-      GetSearchIPCRouterSeqNo(),
+  OnMessageReceived(ChromeViewHostMsg_FocusOmnibox(
+      contents->GetRoutingID(), 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(),
-      GetSearchIPCRouterSeqNo(),
+  OnMessageReceived(ChromeViewHostMsg_FocusOmnibox(
+      contents->GetRoutingID(), 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));
 
   // Add a new tab to deactivate the current tab.
   AddTab(browser(), GURL(url::kAboutBlankURL));
@@ skipping 16 matching lines @@
   EXPECT_CALL(*mock_delegate(), NavigateToURL(destination_url, CURRENT_TAB,
                                               true)).Times(1);
   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(),
-      GetSearchIPCRouterSeqNo(),
-      destination_url, CURRENT_TAB, true));
-  OnMessageReceived(*message);
+  OnMessageReceived(ChromeViewHostMsg_SearchBoxNavigate(
+      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(), destination_url,
+      CURRENT_TAB, true));
 }
 
 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(),
-      GetSearchIPCRouterSeqNo(),
-      destination_url, CURRENT_TAB, true));
-  OnMessageReceived(*message);
+  OnMessageReceived(ChromeViewHostMsg_SearchBoxNavigate(
+      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(), destination_url,
+      CURRENT_TAB, true));
 }
 
 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(), GetSearchIPCRouterSeqNo(),
-      NTP_MOUSEOVER));
-  OnMessageReceived(*message);
+  OnMessageReceived(ChromeViewHostMsg_LogEvent(
+      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(), NTP_MOUSEOVER));
 }
 
 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(), GetSearchIPCRouterSeqNo(),
-      NTP_MOUSEOVER));
-  OnMessageReceived(*message);
+  OnMessageReceived(ChromeViewHostMsg_LogEvent(
+      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(), NTP_MOUSEOVER));
 }
 
 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(),
-      GetSearchIPCRouterSeqNo(),
-      3,
+  OnMessageReceived(ChromeViewHostMsg_LogMostVisitedImpression(
+      contents->GetRoutingID(), 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(),
-      GetSearchIPCRouterSeqNo(),
-      3,
+  OnMessageReceived(ChromeViewHostMsg_LogMostVisitedNavigation(
+      contents->GetRoutingID(), 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(
+  OnMessageReceived(ChromeViewHostMsg_ChromeIdentityCheck(
       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(
+  OnMessageReceived(ChromeViewHostMsg_ChromeIdentityCheck(
       contents->GetRoutingID(), GetSearchIPCRouterSeqNo(), test_identity));
-  OnMessageReceived(*message);
+}
+
+TEST_F(SearchIPCRouterTest, ProcessHistorySyncCheckMsg) {
+  NavigateAndCommitActiveTab(GURL(chrome::kChromeSearchLocalNtpUrl));
+  SetupMockDelegateAndPolicy();
+  MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
+  EXPECT_CALL(*mock_delegate(), OnHistorySyncCheck()).Times(1);
+  EXPECT_CALL(*policy, ShouldProcessHistorySyncCheck()).Times(1)
+      .WillOnce(testing::Return(true));
+
+  content::WebContents* contents = web_contents();
+  OnMessageReceived(ChromeViewHostMsg_HistorySyncCheck(
+      contents->GetRoutingID(), GetSearchIPCRouterSeqNo()));
+}
+
+TEST_F(SearchIPCRouterTest, IgnoreHistorySyncCheckMsg) {
+  NavigateAndCommitActiveTab(GURL("chrome-search://foo/bar"));
+  SetupMockDelegateAndPolicy();
+  MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
+
+  EXPECT_CALL(*mock_delegate(), OnHistorySyncCheck()).Times(0);
+  EXPECT_CALL(*policy, ShouldProcessHistorySyncCheck()).Times(1)
+      .WillOnce(testing::Return(false));
+
+  content::WebContents* contents = web_contents();
+  OnMessageReceived(ChromeViewHostMsg_HistorySyncCheck(
+      contents->GetRoutingID(), GetSearchIPCRouterSeqNo()));
 }
 
 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(), GetSearchIPCRouterSeqNo(), item_url));
-  OnMessageReceived(*message);
+  OnMessageReceived(ChromeViewHostMsg_SearchBoxDeleteMostVisitedItem(
+      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(), item_url));
 }
 
 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(), GetSearchIPCRouterSeqNo(), item_url));
-  OnMessageReceived(*message);
+  OnMessageReceived(ChromeViewHostMsg_SearchBoxDeleteMostVisitedItem(
+      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(), item_url));
 }
 
 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(), GetSearchIPCRouterSeqNo(), item_url));
-  OnMessageReceived(*message);
+  OnMessageReceived(ChromeViewHostMsg_SearchBoxUndoMostVisitedDeletion(
+      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(), item_url));
 }
 
 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(), GetSearchIPCRouterSeqNo(), item_url));
-  OnMessageReceived(*message);
+  OnMessageReceived(ChromeViewHostMsg_SearchBoxUndoMostVisitedDeletion(
+      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(), item_url));
 }
 
 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(), GetSearchIPCRouterSeqNo()));
-  OnMessageReceived(*message);
+  OnMessageReceived(ChromeViewHostMsg_SearchBoxUndoAllMostVisitedDeletions(
+      contents->GetRoutingID(), GetSearchIPCRouterSeqNo()));
 }
 
 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(), GetSearchIPCRouterSeqNo()));
-  OnMessageReceived(*message);
+  OnMessageReceived(ChromeViewHostMsg_SearchBoxUndoAllMostVisitedDeletions(
+      contents->GetRoutingID(), GetSearchIPCRouterSeqNo()));
 }
 
 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);
   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(), page_seq_no, item_url,
-      CURRENT_TAB, true));
-  OnMessageReceived(*message);
+  OnMessageReceived(ChromeViewHostMsg_SearchBoxNavigate(
+      contents->GetRoutingID(), page_seq_no, item_url, CURRENT_TAB, true));
 
   EXPECT_CALL(*mock_delegate(), OnDeleteMostVisitedItem(item_url)).Times(0);
   EXPECT_CALL(*policy, ShouldProcessDeleteMostVisitedItem()).Times(0);
-  message.reset(new ChromeViewHostMsg_SearchBoxDeleteMostVisitedItem(
+  OnMessageReceived(ChromeViewHostMsg_SearchBoxDeleteMostVisitedItem(
       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(
+  OnMessageReceived(ChromeViewHostMsg_SearchBoxUndoMostVisitedDeletion(
       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(
+  OnMessageReceived(ChromeViewHostMsg_SearchBoxUndoAllMostVisitedDeletions(
       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(), page_seq_no,
-      OMNIBOX_FOCUS_VISIBLE));
-  OnMessageReceived(*message);
+  OnMessageReceived(ChromeViewHostMsg_FocusOmnibox(
+      contents->GetRoutingID(), page_seq_no, OMNIBOX_FOCUS_VISIBLE));
 
   EXPECT_CALL(*mock_delegate(), OnLogEvent(NTP_MOUSEOVER)).Times(0);
   EXPECT_CALL(*policy, ShouldProcessLogEvent()).Times(0);
-  message.reset(new ChromeViewHostMsg_LogEvent(contents->GetRoutingID(),
-                                               page_seq_no,
-                                               NTP_MOUSEOVER));
-  OnMessageReceived(*message);
+  OnMessageReceived(ChromeViewHostMsg_LogEvent(
+      contents->GetRoutingID(), page_seq_no, NTP_MOUSEOVER));
 
   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(
+  OnMessageReceived(ChromeViewHostMsg_PasteAndOpenDropdown(
       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(
+  OnMessageReceived(ChromeViewHostMsg_PasteAndOpenDropdown(
       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(
+  OnMessageReceived(ChromeViewHostMsg_PasteAndOpenDropdown(
       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));
 
   GetSearchIPCRouter().SetPromoInformation(true);
@@ skipping 252 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));
 }