| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "chrome/browser/extensions/extension_apitest.h" | 6 #include "chrome/browser/extensions/extension_apitest.h" |
| 7 #include "chrome/browser/task_manager/task_manager.h" | 7 #include "chrome/browser/task_manager/task_manager.h" |
| 8 #include "chrome/browser/task_manager/task_manager_browsertest_util.h" | 8 #include "chrome/browser/task_manager/task_manager_browsertest_util.h" |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/browser/ui/browser_dialogs.h" | 10 #include "chrome/browser/ui/browser_dialogs.h" |
| 11 #include "chrome/browser/ui/browser_window.h" | 11 #include "chrome/browser/ui/browser_window.h" |
| 12 #include "extensions/common/switches.h" | 12 #include "extensions/common/switches.h" |
| 13 #include "extensions/test/extension_test_message_listener.h" | 13 #include "extensions/test/extension_test_message_listener.h" |
| 14 | 14 |
| 15 using ProcessesApiTest = ExtensionApiTest; | 15 using ProcessesApiTest = ExtensionApiTest; |
| 16 | 16 |
| 17 IN_PROC_BROWSER_TEST_F(ProcessesApiTest, Processes) { | 17 // Fails on some MSan bots crbug.com/591581. |
| 18 IN_PROC_BROWSER_TEST_F(ProcessesApiTest, DISABLED_Processes) { |
| 18 ASSERT_TRUE(RunExtensionTest("processes/api")) << message_; | 19 ASSERT_TRUE(RunExtensionTest("processes/api")) << message_; |
| 19 } | 20 } |
| 20 | 21 |
| 21 IN_PROC_BROWSER_TEST_F(ProcessesApiTest, ProcessesVsTaskManager) { | 22 IN_PROC_BROWSER_TEST_F(ProcessesApiTest, ProcessesVsTaskManager) { |
| 22 // This test is for the old implementation of the task manager. We must | 23 // This test is for the old implementation of the task manager. We must |
| 23 // explicitly disable the new one. | 24 // explicitly disable the new one. |
| 24 task_manager::browsertest_util::EnableOldTaskManager(); | 25 task_manager::browsertest_util::EnableOldTaskManager(); |
| 25 | 26 |
| 26 // Ensure task manager is not yet updating | 27 // Ensure task manager is not yet updating |
| 27 TaskManagerModel* model = TaskManager::GetInstance()->model(); | 28 TaskManagerModel* model = TaskManager::GetInstance()->model(); |
| (...skipping 18 matching lines...) Expand all Loading... |
| 46 | 47 |
| 47 // Unload the extension and check that listener count decreases | 48 // Unload the extension and check that listener count decreases |
| 48 UnloadExtension(last_loaded_extension_id()); | 49 UnloadExtension(last_loaded_extension_id()); |
| 49 EXPECT_EQ(1, model->update_requests_); | 50 EXPECT_EQ(1, model->update_requests_); |
| 50 } | 51 } |
| 51 | 52 |
| 52 IN_PROC_BROWSER_TEST_F(ProcessesApiTest, CannotTerminateBrowserProcess) { | 53 IN_PROC_BROWSER_TEST_F(ProcessesApiTest, CannotTerminateBrowserProcess) { |
| 53 ASSERT_TRUE(RunExtensionTest("processes/terminate-browser-process")) | 54 ASSERT_TRUE(RunExtensionTest("processes/terminate-browser-process")) |
| 54 << message_; | 55 << message_; |
| 55 } | 56 } |
| OLD | NEW |