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 354 matching lines @@
   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(), 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();
+  scoped_ptr<IPC::Message> message(new ChromeViewHostMsg_HistorySyncCheck(

[dcheng, 2014/11/12 21:40:47]

Nit: Can't this (and line 477) just be stack allocated?

[beaudoin, 2014/11/20 22:58:26]

Just copied what was everywhere else. I've updated the entire file.

[dcheng, 2014/11/21 20:50:32]

Sorry, you should have just pushed back on this. I didn't notice it was the
pattern in the entire file.

[beaudoin, 2014/11/21 21:16:36]

I agreed with you and figured if no one ever did it we'd keep on using the bad
pattern. :)

+      contents->GetRoutingID(), GetSearchIPCRouterSeqNo()));
+  OnMessageReceived(*message);
+}
+
+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();
+  scoped_ptr<IPC::Message> message(new ChromeViewHostMsg_HistorySyncCheck(
+      contents->GetRoutingID(), GetSearchIPCRouterSeqNo()));
+  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();
@@ skipping 443 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));
 }