chrome/browser/instant/instant_browsertest.cc - Issue 11414223: Move the test functions that deal with focus to interactive_ui_tets_utils.h and into the interactiv…

Side by Side Diff: chrome/browser/instant/instant_browsertest.cc

Issue 11414223: Move the test functions that deal with focus to interactive_ui_tets_utils.h and into the interactiv… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 8 years 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/extensions/extension_keybinding_apitest.cc ('k') | chrome/browser/ui/browser_focus_uitest.cc » ('j') | chrome/test/gpu/gpu_mapsgl_endurance_browsertest.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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_loader.h"	7 #include "chrome/browser/instant/instant_loader.h"

8 #include "chrome/browser/instant/instant_model_observer.h"	8 #include "chrome/browser/instant/instant_model_observer.h"

9 #include "chrome/browser/prefs/pref_service.h"	9 #include "chrome/browser/prefs/pref_service.h"

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

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

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

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

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

15 #include "chrome/browser/ui/browser_instant_controller.h"	15 #include "chrome/browser/ui/browser_instant_controller.h"

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

17 #include "chrome/browser/ui/browser_window.h"	17 #include "chrome/browser/ui/browser_window.h"

18 #include "chrome/browser/ui/omnibox/location_bar.h"	18 #include "chrome/browser/ui/omnibox/location_bar.h"

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

20 #include "chrome/browser/ui/tab_contents/tab_contents.h"	20 #include "chrome/browser/ui/tab_contents/tab_contents.h"

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

22 #include "chrome/common/chrome_notification_types.h"	22 #include "chrome/common/chrome_notification_types.h"

23 #include "chrome/common/pref_names.h"	23 #include "chrome/common/pref_names.h"

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

24 #include "chrome/test/base/in_process_browser_test.h"	25 #include "chrome/test/base/in_process_browser_test.h"

25 #include "chrome/test/base/ui_test_utils.h"	26 #include "chrome/test/base/ui_test_utils.h"

26 #include "content/public/browser/notification_service.h"	27 #include "content/public/browser/notification_service.h"

27 #include "content/public/browser/web_contents.h"	28 #include "content/public/browser/web_contents.h"

28 #include "content/public/test/browser_test_utils.h"	29 #include "content/public/test/browser_test_utils.h"

29 #include "grit/generated_resources.h"	30 #include "grit/generated_resources.h"

30 #include "ui/base/l10n/l10n_util.h"	31 #include "ui/base/l10n/l10n_util.h"

31	32

32 class InstantTestModelObserver : public InstantModelObserver {	33 class InstantTestModelObserver : public InstantModelObserver {

33 public:	34 public:

(...skipping 1019 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1053	1054

1054 SetOmniboxText("ins");	1055 SetOmniboxText("ins");

1055 EXPECT_EQ(ASCIIToUTF16("tant"), omnibox()->GetInstantSuggestion());	1056 EXPECT_EQ(ASCIIToUTF16("tant"), omnibox()->GetInstantSuggestion());

1056	1057

1057 SetOmniboxText("in");	1058 SetOmniboxText("in");

1058 EXPECT_EQ(ASCIIToUTF16("stant"), omnibox()->GetInstantSuggestion());	1059 EXPECT_EQ(ASCIIToUTF16("stant"), omnibox()->GetInstantSuggestion());

1059	1060

1060 SetOmniboxText("insane");	1061 SetOmniboxText("insane");

1061 EXPECT_EQ(ASCIIToUTF16(""), omnibox()->GetInstantSuggestion());	1062 EXPECT_EQ(ASCIIToUTF16(""), omnibox()->GetInstantSuggestion());

1062 }	1063 }

OLD	NEW