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 // Also on Linux: crbug.com/130138 | 16 // Also on Linux: crbug.com/130138 |
17 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHR
OMEOS) | 17 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHR
OMEOS) |
18 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Processes) { | 18 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Processes) { |
19 #else | 19 #else |
20 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Processes) { | 20 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Processes) { |
21 #endif | 21 #endif |
22 CommandLine::ForCurrentProcess()->AppendSwitch( | 22 CommandLine::ForCurrentProcess()->AppendSwitch( |
23 switches::kEnableExperimentalExtensionApis); | 23 switches::kEnableExperimentalExtensionApis); |
24 | 24 |
25 ASSERT_TRUE(RunExtensionTest("processes/api")) << message_; | 25 ASSERT_TRUE(RunExtensionTest("processes/api")) << message_; |
26 } | 26 } |
27 | 27 |
| 28 // http://crbug.com/31663 |
| 29 #if !(defined(OS_WIN) && defined(USE_AURA)) |
| 30 |
28 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ProcessesVsTaskManager) { | 31 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ProcessesVsTaskManager) { |
29 CommandLine::ForCurrentProcess()->AppendSwitch( | 32 CommandLine::ForCurrentProcess()->AppendSwitch( |
30 switches::kEnableExperimentalExtensionApis); | 33 switches::kEnableExperimentalExtensionApis); |
31 | 34 |
32 // Ensure task manager is not yet updating | 35 // Ensure task manager is not yet updating |
33 TaskManagerModel* model = TaskManager::GetInstance()->model(); | 36 TaskManagerModel* model = TaskManager::GetInstance()->model(); |
34 EXPECT_EQ(0, model->update_requests_); | 37 EXPECT_EQ(0, model->update_requests_); |
35 EXPECT_EQ(TaskManagerModel::IDLE, model->update_state_); | 38 EXPECT_EQ(TaskManagerModel::IDLE, model->update_state_); |
36 | 39 |
37 // Load extension that adds listener in background page | 40 // Load extension that adds listener in background page |
38 ExtensionTestMessageListener listener("ready", false); | 41 ExtensionTestMessageListener listener("ready", false); |
39 ASSERT_TRUE(LoadExtension( | 42 ASSERT_TRUE(LoadExtension( |
40 test_data_dir_.AppendASCII("processes").AppendASCII("onupdated"))); | 43 test_data_dir_.AppendASCII("processes").AppendASCII("onupdated"))); |
41 ASSERT_TRUE(listener.WaitUntilSatisfied()); | 44 ASSERT_TRUE(listener.WaitUntilSatisfied()); |
42 | 45 |
43 // Ensure the task manager has started updating | 46 // Ensure the task manager has started updating |
44 EXPECT_EQ(1, model->update_requests_); | 47 EXPECT_EQ(1, model->update_requests_); |
45 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_); | 48 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_); |
46 | 49 |
47 // Now show the task manager and wait for it to be ready | 50 // Now show the task manager and wait for it to be ready |
48 TaskManagerBrowserTestUtil::ShowTaskManagerAndWaitForReady(browser()); | 51 TaskManagerBrowserTestUtil::ShowTaskManagerAndWaitForReady(browser()); |
49 | 52 |
50 EXPECT_EQ(2, model->update_requests_); | 53 EXPECT_EQ(2, model->update_requests_); |
51 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_); | 54 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_); |
52 | 55 |
53 // Unload the extension and check that listener count decreases | 56 // Unload the extension and check that listener count decreases |
54 UnloadExtension(last_loaded_extension_id_); | 57 UnloadExtension(last_loaded_extension_id_); |
55 EXPECT_EQ(1, model->update_requests_); | 58 EXPECT_EQ(1, model->update_requests_); |
56 } | 59 } |
| 60 |
| 61 #endif |
OLD | NEW |