Merge 278958 "Discard ChromeViewHostMsg_SearchBox* IPCs if they ..."

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 162 matching lines @@
     EXPECT_NE(static_cast<SearchTabHelper*>(NULL), search_tab_helper);
     return static_cast<MockSearchIPCRouterPolicy*>(
         search_tab_helper->ipc_router().policy());
   }
 
   SearchIPCRouter& GetSearchIPCRouter() {
     return GetSearchTabHelper(web_contents())->ipc_router();
   }
 
   void OnMessageReceived(const IPC::Message& message) {
-    GetSearchIPCRouter().OnMessageReceived(message);
+    bool should_handle_message =
+        chrome::IsRenderedInInstantProcess(web_contents(), profile());
+    bool handled = GetSearchIPCRouter().OnMessageReceived(message);
+    ASSERT_EQ(should_handle_message, handled);
   }
 
   bool IsActiveTab(content::WebContents* contents) {
     return GetSearchTabHelper(contents)->ipc_router().is_active_tab_;
   }
 
  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,
+                                              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(),
+      contents->GetController().GetVisibleEntry()->GetPageID(),
+      destination_url, CURRENT_TAB, true));
+  OnMessageReceived(*message);
+}
+
 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(
@@ skipping 73 matching lines @@
   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-search://foo/bar"));
+  NavigateAndCommitActiveTab(GURL(chrome::kChromeSearchLocalNtpUrl));
   SetupMockDelegateAndPolicy();
   GURL destination_url("www.foo.com");
   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)
@@ skipping 621 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));
 }