chrome/browser/ui/search/search_tab_helper_unittest.cc - Issue 369303002: Revert of Componentize TemplateURLService

Side by Side Diff: chrome/browser/ui/search/search_tab_helper_unittest.cc

Issue 369303002: Revert of Componentize TemplateURLService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/search/search_ipc_router_unittest.cc ('k') | chrome/browser/ui/search_engines/edit_search_engine_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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_tab_helper.h"	5 #include "chrome/browser/ui/search/search_tab_helper.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "base/memory/scoped_ptr.h"	8 #include "base/memory/scoped_ptr.h"

9 #include "base/metrics/field_trial.h"	9 #include "base/metrics/field_trial.h"

10 #include "base/strings/utf_string_conversions.h"	10 #include "base/strings/utf_string_conversions.h"

11 #include "chrome/browser/prerender/prerender_manager.h"	11 #include "chrome/browser/prerender/prerender_manager.h"

12 #include "chrome/browser/prerender/prerender_manager_factory.h"	12 #include "chrome/browser/prerender/prerender_manager_factory.h"

13 #include "chrome/browser/search/instant_unittest_base.h"	13 #include "chrome/browser/search/instant_unittest_base.h"

14 #include "chrome/browser/search/search.h"	14 #include "chrome/browser/search/search.h"

	15 #include "chrome/browser/search_engines/template_url_service.h"

15 #include "chrome/browser/search_engines/template_url_service_factory.h"	16 #include "chrome/browser/search_engines/template_url_service_factory.h"

16 #include "chrome/browser/signin/fake_signin_manager.h"	17 #include "chrome/browser/signin/fake_signin_manager.h"

17 #include "chrome/browser/signin/signin_manager_factory.h"	18 #include "chrome/browser/signin/signin_manager_factory.h"

18 #include "chrome/browser/sync/profile_sync_service.h"	19 #include "chrome/browser/sync/profile_sync_service.h"

19 #include "chrome/browser/sync/profile_sync_service_factory.h"	20 #include "chrome/browser/sync/profile_sync_service_factory.h"

20 #include "chrome/browser/sync/profile_sync_service_mock.h"	21 #include "chrome/browser/sync/profile_sync_service_mock.h"

21 #include "chrome/browser/ui/search/search_ipc_router.h"	22 #include "chrome/browser/ui/search/search_ipc_router.h"

22 #include "chrome/browser/ui/tabs/tab_strip_model.h"	23 #include "chrome/browser/ui/tabs/tab_strip_model.h"

23 #include "chrome/common/chrome_switches.h"	24 #include "chrome/common/chrome_switches.h"

24 #include "chrome/common/ntp_logging_events.h"	25 #include "chrome/common/ntp_logging_events.h"

25 #include "chrome/common/omnibox_focus_state.h"	26 #include "chrome/common/omnibox_focus_state.h"

26 #include "chrome/common/render_messages.h"	27 #include "chrome/common/render_messages.h"

27 #include "chrome/common/url_constants.h"	28 #include "chrome/common/url_constants.h"

28 #include "chrome/test/base/browser_with_test_window_test.h"	29 #include "chrome/test/base/browser_with_test_window_test.h"

29 #include "chrome/test/base/chrome_render_view_host_test_harness.h"	30 #include "chrome/test/base/chrome_render_view_host_test_harness.h"

30 #include "chrome/test/base/testing_profile.h"	31 #include "chrome/test/base/testing_profile.h"

31 #include "chrome/test/base/ui_test_utils.h"	32 #include "chrome/test/base/ui_test_utils.h"

32 #include "components/search_engines/template_url_service.h"

33 #include "content/public/browser/navigation_controller.h"	33 #include "content/public/browser/navigation_controller.h"

34 #include "content/public/browser/navigation_entry.h"	34 #include "content/public/browser/navigation_entry.h"

35 #include "content/public/browser/web_contents.h"	35 #include "content/public/browser/web_contents.h"

36 #include "content/public/test/mock_render_process_host.h"	36 #include "content/public/test/mock_render_process_host.h"

37 #include "grit/generated_resources.h"	37 #include "grit/generated_resources.h"

38 #include "ipc/ipc_message.h"	38 #include "ipc/ipc_message.h"

39 #include "ipc/ipc_test_sink.h"	39 #include "ipc/ipc_test_sink.h"

40 #include "net/base/net_errors.h"	40 #include "net/base/net_errors.h"

41 #include "testing/gmock/include/gmock/gmock.h"	41 #include "testing/gmock/include/gmock/gmock.h"

42 #include "testing/gtest/include/gtest/gtest.h"	42 #include "testing/gtest/include/gtest/gtest.h"

(...skipping 415 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
458 }	458 }

459	459

460 TEST_F(SearchTabHelperPrerenderTest,	460 TEST_F(SearchTabHelperPrerenderTest,

461 OnTabActivatedNoPrerenderIfOmniboxBlurred) {	461 OnTabActivatedNoPrerenderIfOmniboxBlurred) {

462 SearchTabHelperPrerenderTest::omnibox_has_focus_ = false;	462 SearchTabHelperPrerenderTest::omnibox_has_focus_ = false;

463 SearchTabHelper* search_tab_helper =	463 SearchTabHelper* search_tab_helper =

464 SearchTabHelper::FromWebContents(web_contents());	464 SearchTabHelper::FromWebContents(web_contents());

465 search_tab_helper->OnTabActivated();	465 search_tab_helper->OnTabActivated();

466 ASSERT_FALSE(IsInstantURLMarkedForPrerendering());	466 ASSERT_FALSE(IsInstantURLMarkedForPrerendering());

467 }	467 }

OLD	NEW