| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/extensions/extension_test_message_listener.h" | 7 #include "chrome/browser/extensions/extension_test_message_listener.h" |
| 8 #include "chrome/browser/task_manager/task_manager.h" | 8 #include "chrome/browser/task_manager/task_manager.h" |
| 9 #include "chrome/browser/task_manager/task_manager_browsertest_util.h" | 9 #include "chrome/browser/task_manager/task_manager_browsertest_util.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| 11 #include "chrome/browser/ui/browser_window.h" | 11 #include "chrome/browser/ui/browser_window.h" |
| 12 #include "chrome/common/chrome_switches.h" | 12 #include "chrome/common/chrome_switches.h" |
| 13 | 13 |
| 14 // Sometimes times out on Mac OS |
| 15 // crbug.com/ |
| 16 #ifdef OS_MACOSX |
| 17 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Processes) { |
| 18 #else |
| 14 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Processes) { | 19 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Processes) { |
| 20 #endif |
| 15 CommandLine::ForCurrentProcess()->AppendSwitch( | 21 CommandLine::ForCurrentProcess()->AppendSwitch( |
| 16 switches::kEnableExperimentalExtensionApis); | 22 switches::kEnableExperimentalExtensionApis); |
| 17 | 23 |
| 18 ASSERT_TRUE(RunExtensionTest("processes/api")) << message_; | 24 ASSERT_TRUE(RunExtensionTest("processes/api")) << message_; |
| 19 } | 25 } |
| 20 | 26 |
| 21 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ProcessesVsTaskManager) { | 27 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ProcessesVsTaskManager) { |
| 22 CommandLine::ForCurrentProcess()->AppendSwitch( | 28 CommandLine::ForCurrentProcess()->AppendSwitch( |
| 23 switches::kEnableExperimentalExtensionApis); | 29 switches::kEnableExperimentalExtensionApis); |
| 24 | 30 |
| (...skipping 15 matching lines...) Expand all Loading... |
| 40 // Now show the task manager and wait for it to be ready | 46 // Now show the task manager and wait for it to be ready |
| 41 TaskManagerBrowserTestUtil::ShowTaskManagerAndWaitForReady(browser()); | 47 TaskManagerBrowserTestUtil::ShowTaskManagerAndWaitForReady(browser()); |
| 42 | 48 |
| 43 EXPECT_EQ(2, model->update_requests_); | 49 EXPECT_EQ(2, model->update_requests_); |
| 44 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_); | 50 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_); |
| 45 | 51 |
| 46 // Unload the extension and check that listener count decreases | 52 // Unload the extension and check that listener count decreases |
| 47 UnloadExtension(last_loaded_extension_id_); | 53 UnloadExtension(last_loaded_extension_id_); |
| 48 EXPECT_EQ(1, model->update_requests_); | 54 EXPECT_EQ(1, model->update_requests_); |
| 49 } | 55 } |
| 50 | |
| OLD | NEW |