| 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/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 and Windows | 14 // Sometimes times out on Mac OS and Windows |
| 15 // crbug.com/97499 | 15 // crbug.com/97499 |
| 16 #if defined(OS_MACOSX) || defined(OS_WIN) | 16 // Also on Linux: crbug.com/130138 |
| 17 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHR
OMEOS) |
| 17 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Processes) { | 18 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Processes) { |
| 18 #else | 19 #else |
| 19 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Processes) { | 20 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Processes) { |
| 20 #endif | 21 #endif |
| 21 CommandLine::ForCurrentProcess()->AppendSwitch( | 22 CommandLine::ForCurrentProcess()->AppendSwitch( |
| 22 switches::kEnableExperimentalExtensionApis); | 23 switches::kEnableExperimentalExtensionApis); |
| 23 | 24 |
| 24 ASSERT_TRUE(RunExtensionTest("processes/api")) << message_; | 25 ASSERT_TRUE(RunExtensionTest("processes/api")) << message_; |
| 25 } | 26 } |
| 26 | 27 |
| (...skipping 19 matching lines...) Expand all Loading... |
| 46 // Now show the task manager and wait for it to be ready | 47 // Now show the task manager and wait for it to be ready |
| 47 TaskManagerBrowserTestUtil::ShowTaskManagerAndWaitForReady(browser()); | 48 TaskManagerBrowserTestUtil::ShowTaskManagerAndWaitForReady(browser()); |
| 48 | 49 |
| 49 EXPECT_EQ(2, model->update_requests_); | 50 EXPECT_EQ(2, model->update_requests_); |
| 50 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_); | 51 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_); |
| 51 | 52 |
| 52 // Unload the extension and check that listener count decreases | 53 // Unload the extension and check that listener count decreases |
| 53 UnloadExtension(last_loaded_extension_id_); | 54 UnloadExtension(last_loaded_extension_id_); |
| 54 EXPECT_EQ(1, model->update_requests_); | 55 EXPECT_EQ(1, model->update_requests_); |
| 55 } | 56 } |
| OLD | NEW |