chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc - Issue 1912773002: Remove the old task manager view

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

Issue 1912773002: Remove the old task manager view (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: thestig's comments Created 4 years, 8 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

« chrome/browser/task_manager/printing_information.cc ('K') | « chrome/browser/ui/search/instant_extended_interactive_uitest.cc ('k') | chrome/browser/ui/toolbar/app_menu_model.cc » ('j') | chrome/browser/ui/views/new_task_manager_view.cc » ('J')
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 <stddef.h>	5 #include <stddef.h>

6	6

7 #include "base/strings/string_util.h"	7 #include "base/strings/string_util.h"

8 #include "chrome/browser/chrome_notification_types.h"	8 #include "chrome/browser/chrome_notification_types.h"

9 #include "chrome/browser/search/instant_service.h"	9 #include "chrome/browser/search/instant_service.h"

10 #include "chrome/browser/search/instant_service_factory.h"	10 #include "chrome/browser/search/instant_service_factory.h"

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

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

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

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

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

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

17 #include "chrome/browser/ui/tabs/tab_strip_model.h"	15 #include "chrome/browser/ui/tabs/tab_strip_model.h"

18 #include "chrome/common/search_types.h"	16 #include "chrome/common/search_types.h"

19 #include "chrome/common/url_constants.h"	17 #include "chrome/common/url_constants.h"

20 #include "chrome/test/base/in_process_browser_test.h"	18 #include "chrome/test/base/in_process_browser_test.h"

21 #include "chrome/test/base/interactive_test_utils.h"	19 #include "chrome/test/base/interactive_test_utils.h"

22 #include "chrome/test/base/ui_test_utils.h"	20 #include "chrome/test/base/ui_test_utils.h"

23 #include "components/omnibox/browser/omnibox_view.h"	21 #include "components/omnibox/browser/omnibox_view.h"

(...skipping 119 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
143 EXPECT_EQ("test", GetOmniboxText());	141 EXPECT_EQ("test", GetOmniboxText());

144 EXPECT_EQ(OMNIBOX_FOCUS_VISIBLE, omnibox()->model()->focus_state());	142 EXPECT_EQ(OMNIBOX_FOCUS_VISIBLE, omnibox()->model()->focus_state());

145	143

146 // Pressing enter should search for [test].	144 // Pressing enter should search for [test].

147 const base::string16& search_title =	145 const base::string16& search_title =

148 base::ASCIIToUTF16("test - Google Search");	146 base::ASCIIToUTF16("test - Google Search");

149 content::TitleWatcher title_watcher(active_tab, search_title);	147 content::TitleWatcher title_watcher(active_tab, search_title);

150 PressEnterAndWaitForNavigation();	148 PressEnterAndWaitForNavigation();

151 EXPECT_EQ(search_title, title_watcher.WaitAndGetTitle());	149 EXPECT_EQ(search_title, title_watcher.WaitAndGetTitle());

152 }	150 }

OLD	NEW