diff options
Diffstat (limited to 'chrome/browser/ui/search')
7 files changed, 13 insertions, 13 deletions
diff --git a/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc b/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc index 1eb9bd8..7707c58 100644 --- a/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc +++ b/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc @@ -50,7 +50,7 @@ class InstantExtendedManualTest : public InProcessBrowserTest, new net::ScopedDefaultHostResolverProc(host_resolver_proc_.get())); } - virtual ~InstantExtendedManualTest() { + ~InstantExtendedManualTest() override { scoped_host_resolver_proc_.reset(); host_resolver_proc_ = NULL; } diff --git a/chrome/browser/ui/search/instant_page_unittest.cc b/chrome/browser/ui/search/instant_page_unittest.cc index 2682621..63ea4e7 100644 --- a/chrome/browser/ui/search/instant_page_unittest.cc +++ b/chrome/browser/ui/search/instant_page_unittest.cc @@ -49,7 +49,7 @@ class FakePageDelegate : public InstantPage::Delegate { class InstantPageTest : public ChromeRenderViewHostTestHarness { public: - virtual void SetUp() override; + void SetUp() override; bool MessageWasSent(uint32 id) { return process()->sink().GetFirstMessageMatching(id) != NULL; diff --git a/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc b/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc index bd06fb9..8501ea4 100644 --- a/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc +++ b/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc @@ -165,7 +165,7 @@ class InstantSearchPrerendererTest : public InstantUnitTestBase { InstantSearchPrerendererTest() {} protected: - virtual void SetUp() override { + void SetUp() override { ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial("EmbeddedSearch", "Group1 strk:20")); InstantUnitTestBase::SetUp(); @@ -430,7 +430,7 @@ class ReuseInstantSearchBasePageTest : public InstantSearchPrerendererTest { ReuseInstantSearchBasePageTest() {} protected: - virtual void SetUp() override { + void SetUp() override { ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial("EmbeddedSearch", "Group1 strk:20")); InstantUnitTestBase::SetUp(); @@ -471,7 +471,7 @@ TEST_F(ReuseInstantSearchBasePageTest, #if !defined(OS_IOS) && !defined(OS_ANDROID) class TestUsePrerenderPage : public InstantSearchPrerendererTest { protected: - virtual void SetUp() override { + void SetUp() override { // Disable query extraction flag in field trials. ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial( "EmbeddedSearch", "Group1 strk:20 query_extraction:0")); diff --git a/chrome/browser/ui/search/search_ipc_router_policy_unittest.cc b/chrome/browser/ui/search/search_ipc_router_policy_unittest.cc index 4eeb088..8aeca4c 100644 --- a/chrome/browser/ui/search/search_ipc_router_policy_unittest.cc +++ b/chrome/browser/ui/search/search_ipc_router_policy_unittest.cc @@ -17,7 +17,7 @@ class SearchIPCRouterPolicyTest : public BrowserWithTestWindowTest { public: - virtual void SetUp() { + void SetUp() override { BrowserWithTestWindowTest::SetUp(); AddTab(browser(), GURL("chrome://blank")); SearchTabHelper::CreateForWebContents(web_contents()); diff --git a/chrome/browser/ui/search/search_ipc_router_unittest.cc b/chrome/browser/ui/search/search_ipc_router_unittest.cc index 4c87804..2d33e1f 100644 --- a/chrome/browser/ui/search/search_ipc_router_unittest.cc +++ b/chrome/browser/ui/search/search_ipc_router_unittest.cc @@ -91,7 +91,7 @@ class SearchIPCRouterTest : public BrowserWithTestWindowTest { public: SearchIPCRouterTest() : field_trial_list_(NULL) {} - virtual void SetUp() { + void SetUp() override { BrowserWithTestWindowTest::SetUp(); AddTab(browser(), GURL("chrome://blank")); SearchTabHelper::CreateForWebContents(web_contents()); diff --git a/chrome/browser/ui/search/search_model_unittest.cc b/chrome/browser/ui/search/search_model_unittest.cc index 2f4a8f6..646639e 100644 --- a/chrome/browser/ui/search/search_model_unittest.cc +++ b/chrome/browser/ui/search/search_model_unittest.cc @@ -66,8 +66,8 @@ void MockSearchModelObserver::VerifyNotificationCount(int expected_count) { class SearchModelTest : public ChromeRenderViewHostTestHarness { public: - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; MockSearchModelObserver mock_observer; SearchModel* model; diff --git a/chrome/browser/ui/search/search_tab_helper_unittest.cc b/chrome/browser/ui/search/search_tab_helper_unittest.cc index 7ca1df7..4498737 100644 --- a/chrome/browser/ui/search/search_tab_helper_unittest.cc +++ b/chrome/browser/ui/search/search_tab_helper_unittest.cc @@ -73,7 +73,7 @@ class MockSearchIPCRouterDelegate : public SearchIPCRouter::Delegate { class SearchTabHelperTest : public ChromeRenderViewHostTestHarness { public: - virtual void SetUp() { + void SetUp() override { ChromeRenderViewHostTestHarness::SetUp(); SearchTabHelper::CreateForWebContents(web_contents()); } @@ -314,7 +314,7 @@ TEST_F(SearchTabHelperTest, TitleIsSetForNTP) { class SearchTabHelperWindowTest : public BrowserWithTestWindowTest { protected: - virtual void SetUp() override { + void SetUp() override { BrowserWithTestWindowTest::SetUp(); TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse( profile(), &TemplateURLServiceFactory::BuildInstanceFor); @@ -401,10 +401,10 @@ TEST_F(SearchTabHelperWindowTest, OnProvisionalLoadFailDontRedirectNonNTP) { class SearchTabHelperPrerenderTest : public InstantUnitTestBase { public: - virtual ~SearchTabHelperPrerenderTest() {} + ~SearchTabHelperPrerenderTest() override {} protected: - virtual void SetUp() override { + void SetUp() override { ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial( "EmbeddedSearch", "Group1 espv:89 prefetch_results:1 " |