Chromium Code Reviews| 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 b79b4d4cc6f3eb445d7c660a7244dd307a911b0d..e538437cea18c7a5c7c6c6451e1b545639be6501 100644 |
| --- a/chrome/browser/extensions/app_background_page_apitest.cc |
| +++ b/chrome/browser/extensions/app_background_page_apitest.cc |
| @@ -16,7 +16,6 @@ |
| #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" |
| @@ -39,6 +38,7 @@ |
| #if defined(OS_MACOSX) |
| #include "base/mac/scoped_nsautorelease_pool.h" |
| +#include "chrome/browser/task_manager/task_manager_browsertest_util.h" |
| #endif |
| using base::ASCIIToUTF16; |
| @@ -304,13 +304,12 @@ IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, ManifestBackgroundPage) { |
| UnloadExtension(extension->id()); |
| } |
| +// Old task manager browser tests should only run on Mac. |
|
tapted
2016/04/26 01:08:08
I'm not sure this is testing the old task manager
afakhry
2016/04/26 22:22:43
You're right. Thanks for catching that!
However th
|
| +#if defined(OS_MACOSX) |
| 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 |
| @@ -362,6 +361,7 @@ IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, NoJsBackgroundPage) { |
| EXPECT_EQ(0u, background_deleted_tracker.size()); |
| UnloadExtension(extension->id()); |
| } |
| +#endif // defined(OS_MACOSX) |
| IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, NoJsManifestBackgroundPage) { |
| host_resolver()->AddRule("a.com", "127.0.0.1"); |