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

Unified Diff: chrome/browser/extensions/app_background_page_apitest.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
Index: chrome/browser/extensions/app_background_page_apitest.cc
diff --git a/chrome/browser/extensions/app_background_page_apitest.cc b/chrome/browser/extensions/app_background_page_apitest.cc
index c2556338d9fa38f3fbebfdf2bce96dac20b048e8..3e51aa063824fc8a156d7aca0130a461c2df654d 100644
--- a/chrome/browser/extensions/app_background_page_apitest.cc
+++ b/chrome/browser/extensions/app_background_page_apitest.cc
@@ -15,6 +15,7 @@
#include "chrome/browser/extensions/extension_apitest.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/task_manager/task_manager_browsertest_util.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_dialogs.h"
#include "chrome/browser/ui/browser_window.h"
@@ -306,6 +307,9 @@ IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, NoJsBackgroundPage) {
// Keep the task manager up through this test to verify that a crash doesn't
// happen when window.open creates a background page that switches
// RenderViewHosts. See http://crbug.com/165138.
+ // This test is for the old implementation of the task manager. We must
+ // explicitly disable the new one.
+ task_manager::browsertest_util::EnableOldTaskManager();
chrome::ShowTaskManager(browser());
// Make sure that no BackgroundContentses get deleted (a signal that repeated
« no previous file with comments | « chrome/browser/extensions/api/processes/processes_apitest.cc ('k') | chrome/browser/prerender/prerender_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698