Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(181)

Unified Diff: chrome/browser/apps/guest_view/web_view_browsertest.cc

Issue 1293813005: Change the new-task-manager flag so that the new implementation is enabled by default for all users. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix comment Created 5 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/extensions/api/processes/processes_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/apps/guest_view/web_view_browsertest.cc
diff --git a/chrome/browser/apps/guest_view/web_view_browsertest.cc b/chrome/browser/apps/guest_view/web_view_browsertest.cc
index ef825f36fef03a78acc1dfbbf9f07d11976fc1a5..6c85937d6269f97ac97af832ce072677e24c7c29 100644
--- a/chrome/browser/apps/guest_view/web_view_browsertest.cc
+++ b/chrome/browser/apps/guest_view/web_view_browsertest.cc
@@ -1374,6 +1374,10 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, NoPrerenderer) {
// Verify that existing <webview>'s are detected when the task manager starts
// up.
IN_PROC_BROWSER_TEST_F(WebViewTest, TaskManagerExistingWebView) {
+ // This test is for the old implementation of the task manager. We must
+ // explicitly disable the new one.
+ task_manager::browsertest_util::EnableOldTaskManager();
+
ASSERT_TRUE(StartEmbeddedTestServer());
LoadGuest("/extensions/platform_apps/web_view/task_manager/guest.html",
@@ -1396,6 +1400,10 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, TaskManagerExistingWebView) {
// Verify that the task manager notices the creation of new <webview>'s.
IN_PROC_BROWSER_TEST_F(WebViewTest, TaskManagerNewWebView) {
+ // This test is for the old implementation of the task manager. We must
+ // explicitly disable the new one.
+ task_manager::browsertest_util::EnableOldTaskManager();
+
ASSERT_TRUE(StartEmbeddedTestServer());
chrome::ShowTaskManager(browser()); // Show task manager BEFORE guest loads.
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/extensions/api/processes/processes_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698