| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/search/search_ipc_router.h" | 5 #include "chrome/browser/ui/search/search_ipc_router.h" |
| 6 | 6 |
| 7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "chrome/browser/ui/search/search_ipc_router_policy_impl.h" | 9 #include "chrome/browser/ui/search/search_ipc_router_policy_impl.h" |
| 10 #include "chrome/browser/ui/search/search_tab_helper.h" | 10 #include "chrome/browser/ui/search/search_tab_helper.h" |
| 11 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 11 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 12 #include "chrome/common/chrome_switches.h" | 12 #include "chrome/common/chrome_switches.h" |
| 13 #include "chrome/common/url_constants.h" | 13 #include "chrome/common/url_constants.h" |
| 14 #include "chrome/test/base/browser_with_test_window_test.h" | 14 #include "chrome/test/base/browser_with_test_window_test.h" |
| 15 #include "testing/gtest/include/gtest/gtest.h" | 15 #include "testing/gtest/include/gtest/gtest.h" |
| 16 #include "url/gurl.h" | 16 #include "url/gurl.h" |
| 17 | 17 |
| 18 class SearchIPCRouterPolicyTest : public BrowserWithTestWindowTest { | 18 class SearchIPCRouterPolicyTest : public BrowserWithTestWindowTest { |
| 19 public: | 19 public: |
| 20 virtual void SetUp() { | 20 virtual void SetUp() { |
| 21 CommandLine::ForCurrentProcess()->AppendSwitch( | |
| 22 switches::kEnableInstantExtendedAPI); | |
| 23 BrowserWithTestWindowTest::SetUp(); | 21 BrowserWithTestWindowTest::SetUp(); |
| 24 AddTab(browser(), GURL("chrome://blank")); | 22 AddTab(browser(), GURL("chrome://blank")); |
| 25 SearchTabHelper::CreateForWebContents(web_contents()); | 23 SearchTabHelper::CreateForWebContents(web_contents()); |
| 26 } | 24 } |
| 27 | 25 |
| 28 SearchTabHelper* GetSearchTabHelper() { | 26 SearchTabHelper* GetSearchTabHelper() { |
| 29 SearchTabHelper* search_tab_helper = | 27 SearchTabHelper* search_tab_helper = |
| 30 SearchTabHelper::FromWebContents(web_contents()); | 28 SearchTabHelper::FromWebContents(web_contents()); |
| 31 EXPECT_NE(static_cast<SearchTabHelper*>(NULL), search_tab_helper); | 29 EXPECT_NE(static_cast<SearchTabHelper*>(NULL), search_tab_helper); |
| 32 return search_tab_helper; | 30 return search_tab_helper; |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 252 ShouldSendThemeBackgroundInfo()); | 250 ShouldSendThemeBackgroundInfo()); |
| 253 } | 251 } |
| 254 | 252 |
| 255 TEST_F(SearchIPCRouterPolicyTest, SubmitQuery) { | 253 TEST_F(SearchIPCRouterPolicyTest, SubmitQuery) { |
| 256 NavigateAndCommitActiveTab(GURL("chrome-search://foo/bar")); | 254 NavigateAndCommitActiveTab(GURL("chrome-search://foo/bar")); |
| 257 SearchTabHelper* search_tab_helper = | 255 SearchTabHelper* search_tab_helper = |
| 258 SearchTabHelper::FromWebContents(web_contents()); | 256 SearchTabHelper::FromWebContents(web_contents()); |
| 259 ASSERT_NE(static_cast<SearchTabHelper*>(NULL), search_tab_helper); | 257 ASSERT_NE(static_cast<SearchTabHelper*>(NULL), search_tab_helper); |
| 260 EXPECT_TRUE(search_tab_helper->ipc_router().policy()->ShouldSubmitQuery()); | 258 EXPECT_TRUE(search_tab_helper->ipc_router().policy()->ShouldSubmitQuery()); |
| 261 } | 259 } |
| OLD | NEW |