| 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 fc9d79ccabcf3ac6fbbf9f5fb971f660d6677e1e..44aaaaab8c8d668a084ae7afbb6b88f298c23d95 100644
|
| --- a/chrome/browser/ui/search/search_ipc_router_unittest.cc
|
| +++ b/chrome/browser/ui/search/search_ipc_router_unittest.cc
|
| @@ -184,7 +184,10 @@ class SearchIPCRouterTest : public BrowserWithTestWindowTest {
|
| }
|
|
|
| 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) {
|
| @@ -196,6 +199,26 @@ class SearchIPCRouterTest : public BrowserWithTestWindowTest {
|
| 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(),
|
| + GetSearchIPCRouterSeqNo(),
|
| + destination_url, CURRENT_TAB, true));
|
| + OnMessageReceived(*message);
|
| +}
|
| +
|
| TEST_F(SearchIPCRouterTest, ProcessVoiceSearchSupportMsg) {
|
| NavigateAndCommitActiveTab(GURL("chrome-search://foo/bar"));
|
| SetupMockDelegateAndPolicy();
|
| @@ -285,7 +308,7 @@ TEST_F(SearchIPCRouterTest, HandleTabChangedEvents) {
|
| }
|
|
|
| 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,
|
|
|