Nuke chrome.embeddedeseach.newTabPage.navigateContentWindow

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 <stdint.h>
 
 #include <memory>
 #include <tuple>
@@ skipping 32 matching lines @@
 #include "url/gurl.h"
 
 namespace {
 
 class MockSearchIPCRouterDelegate : public SearchIPCRouter::Delegate {
  public:
   virtual ~MockSearchIPCRouterDelegate() {}
 
   MOCK_METHOD1(OnInstantSupportDetermined, void(bool supports_instant));
   MOCK_METHOD1(FocusOmnibox, void(OmniboxFocusState state));
-  MOCK_METHOD2(NavigateToURL, void(const GURL&, WindowOpenDisposition));
   MOCK_METHOD1(OnDeleteMostVisitedItem, void(const GURL& url));
   MOCK_METHOD1(OnUndoMostVisitedDeletion, void(const GURL& url));
   MOCK_METHOD0(OnUndoAllMostVisitedDeletions, void());
   MOCK_METHOD2(OnLogEvent, void(NTPLoggingEventType event,
                                 base::TimeDelta time));
   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_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());
@@ skipping 118 matching lines @@
   }
 
  private:
   MockSearchIPCRouterDelegate delegate_;
   base::FieldTrialList field_trial_list_;
 };
 
 TEST_F(SearchIPCRouterTest, IgnoreMessagesFromNonInstantRenderers) {
   NavigateAndCommitActiveTab(GURL("file://foo/bar"));
   SetupMockDelegateAndPolicy();
-  GURL destination_url("www.foo.com");
-  EXPECT_CALL(*mock_delegate(),
-              NavigateToURL(destination_url, CURRENT_TAB)).Times(0);
+  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);
 
   MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
-  EXPECT_CALL(*policy, ShouldProcessNavigateToURL(is_active_tab)).Times(0);
+  EXPECT_CALL(*policy, ShouldProcessFocusOmnibox(is_active_tab)).Times(0);
 
-  OnMessageReceived(ChromeViewHostMsg_SearchBoxNavigate(
-      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(), destination_url,
-      CURRENT_TAB));
+  OnMessageReceived(ChromeViewHostMsg_FocusOmnibox(
+      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(),
+      OMNIBOX_FOCUS_VISIBLE));
 }
 
 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);
@@ skipping 36 matching lines @@
   EXPECT_EQ(0, browser()->tab_strip_model()->active_index());
   EXPECT_FALSE(IsActiveTab(contents));
 
   // Activate the first tab.
   browser()->tab_strip_model()->ActivateTabAt(1, false);
   EXPECT_EQ(browser()->tab_strip_model()->active_index(),
             browser()->tab_strip_model()->GetIndexOfWebContents(contents));
   EXPECT_TRUE(IsActiveTab(contents));
 }
 
-TEST_F(SearchIPCRouterTest, ProcessNavigateToURLMsg) {
-  NavigateAndCommitActiveTab(GURL(chrome::kChromeSearchLocalNtpUrl));
-  SetupMockDelegateAndPolicy();
-  GURL destination_url("www.foo.com");
-  EXPECT_CALL(*mock_delegate(),
-              NavigateToURL(destination_url, CURRENT_TAB)).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));
-
-  OnMessageReceived(ChromeViewHostMsg_SearchBoxNavigate(
-      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(), destination_url,
-      CURRENT_TAB));
-}
-
-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)).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));
-
-  OnMessageReceived(ChromeViewHostMsg_SearchBoxNavigate(
-      contents->GetRoutingID(), GetSearchIPCRouterSeqNo(), destination_url,
-      CURRENT_TAB));
-}
-
 TEST_F(SearchIPCRouterTest, ProcessLogEventMsg) {
   base::TimeDelta delta = base::TimeDelta::FromMilliseconds(123);
   NavigateAndCommitActiveTab(GURL(chrome::kChromeSearchLocalNtpUrl));
   SetupMockDelegateAndPolicy();
   MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
   EXPECT_CALL(*mock_delegate(), OnLogEvent(NTP_MOUSEOVER, delta)).Times(1);
   EXPECT_CALL(*policy, ShouldProcessLogEvent()).Times(1)
       .WillOnce(testing::Return(true));
 
   content::WebContents* contents = web_contents();
@@ skipping 187 matching lines @@
 
 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)).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);
-  OnMessageReceived(ChromeViewHostMsg_SearchBoxNavigate(
-      contents->GetRoutingID(), page_seq_no, item_url, CURRENT_TAB));
+
+  // Navigate away from the NTP. Afterwards, all messages should be ignored.
+  NavigateAndCommitActiveTab(item_url);
 
   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));
 
   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));
@@ skipping 287 matching lines @@
 
   // 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;
   }
 }