chrome/browser/ui/search/instant_browsertest.cc - Issue 12520005: Move desktop-specific Instant bits to c/b/ui/search.

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

Issue 12520005: Move desktop-specific Instant bits to c/b/ui/search. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 7 years, 9 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

« no previous file with comments | « chrome/browser/ui/search/OWNERS ('k') | chrome/browser/ui/search/instant_commit_type.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2012 The Chromium Authors. All rights reserved.	1 // Copyright 2012 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/content_settings/host_content_settings_map.h"	5 #include "chrome/browser/content_settings/host_content_settings_map.h"

6 #include "chrome/browser/history/history_service_factory.h"	6 #include "chrome/browser/history/history_service_factory.h"

7 #include "chrome/browser/instant/instant_overlay.h"

8 #include "chrome/browser/instant/instant_service.h"	7 #include "chrome/browser/instant/instant_service.h"

9 #include "chrome/browser/instant/instant_service_factory.h"	8 #include "chrome/browser/instant/instant_service_factory.h"

10 #include "chrome/browser/instant/instant_test_utils.h"

11 #include "chrome/browser/profiles/profile.h"	9 #include "chrome/browser/profiles/profile.h"

12 #include "chrome/browser/search_engines/template_url_service.h"	10 #include "chrome/browser/search_engines/template_url_service.h"

13 #include "chrome/browser/search_engines/template_url_service_factory.h"	11 #include "chrome/browser/search_engines/template_url_service_factory.h"

14 #include "chrome/browser/task_manager/task_manager.h"	12 #include "chrome/browser/task_manager/task_manager.h"

15 #include "chrome/browser/task_manager/task_manager_browsertest_util.h"	13 #include "chrome/browser/task_manager/task_manager_browsertest_util.h"

16 #include "chrome/browser/ui/browser.h"	14 #include "chrome/browser/ui/browser.h"

17 #include "chrome/browser/ui/browser_commands.h"	15 #include "chrome/browser/ui/browser_commands.h"

18 #include "chrome/browser/ui/host_desktop.h"	16 #include "chrome/browser/ui/host_desktop.h"

19 #include "chrome/browser/ui/omnibox/omnibox_view.h"	17 #include "chrome/browser/ui/omnibox/omnibox_view.h"

	18 #include "chrome/browser/ui/search/instant_overlay.h"

	19 #include "chrome/browser/ui/search/instant_test_utils.h"

20 #include "chrome/browser/ui/tabs/tab_strip_model.h"	20 #include "chrome/browser/ui/tabs/tab_strip_model.h"

21 #include "chrome/common/url_constants.h"	21 #include "chrome/common/url_constants.h"

22 #include "chrome/test/base/in_process_browser_test.h"	22 #include "chrome/test/base/in_process_browser_test.h"

23 #include "chrome/test/base/interactive_test_utils.h"	23 #include "chrome/test/base/interactive_test_utils.h"

24 #include "chrome/test/base/ui_test_utils.h"	24 #include "chrome/test/base/ui_test_utils.h"

25 #include "content/public/browser/render_process_host.h"	25 #include "content/public/browser/render_process_host.h"

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

27 #include "content/public/test/browser_test_utils.h"	27 #include "content/public/test/browser_test_utils.h"

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

29 #include "ui/base/l10n/l10n_util.h"	29 #include "ui/base/l10n/l10n_util.h"

(...skipping 976 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1006 content::WebContents* active_tab =	1006 content::WebContents* active_tab =

1007 browser()->tab_strip_model()->GetActiveWebContents();	1007 browser()->tab_strip_model()->GetActiveWebContents();

1008 EXPECT_TRUE(instant_service->IsInstantProcess(	1008 EXPECT_TRUE(instant_service->IsInstantProcess(

1009 active_tab->GetRenderProcessHost()->GetID()));	1009 active_tab->GetRenderProcessHost()->GetID()));

1010	1010

1011 // Navigating away should change the process.	1011 // Navigating away should change the process.

1012 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUINewTabURL));	1012 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUINewTabURL));

1013 EXPECT_FALSE(instant_service->IsInstantProcess(	1013 EXPECT_FALSE(instant_service->IsInstantProcess(

1014 active_tab->GetRenderProcessHost()->GetID()));	1014 active_tab->GetRenderProcessHost()->GetID()));

1015 }	1015 }

OLD	NEW