| 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.
|
|
|