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

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 2d33e1f3afb943f12f15f69a1b4f21ff48d3334c..036d074774caed41a57aeabeba007621ba5bd734 100644
--- a/chrome/browser/ui/search/search_ipc_router_unittest.cc
+++ b/chrome/browser/ui/search/search_ipc_router_unittest.cc
@@ -58,6 +58,7 @@ class MockSearchIPCRouterDelegate : public SearchIPCRouter::Delegate {
                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 {
@@ -73,6 +74,7 @@ class MockSearchIPCRouterPolicy : public SearchIPCRouter::Policy {
   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());
@@ -447,6 +449,35 @@ TEST_F(SearchIPCRouterTest, IgnoreChromeIdentityCheckMsg) {
   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();