Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(746)

Side by Side Diff: chrome/browser/extensions/api/processes/processes_apitest.cc

Issue 1584473004: Migrate ProcessesEventRouter to the new task manager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix nit. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/api/processes/processes_api.h"
6 #include "chrome/browser/extensions/extension_apitest.h" 7 #include "chrome/browser/extensions/extension_apitest.h"
7 #include "chrome/browser/task_manager/task_manager.h" 8 #include "chrome/browser/task_management/task_manager_interface.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 class ProcessesApiTest : public ExtensionApiTest {
16 public:
17 ProcessesApiTest() {}
18 ~ProcessesApiTest() override {}
16 19
17 // Fails on some MSan bots crbug.com/591581. 20 int GetListenersCount() {
18 IN_PROC_BROWSER_TEST_F(ProcessesApiTest, DISABLED_Processes) { 21 return extensions::ProcessesAPI::Get(profile())->
22 processes_event_router()->listeners_;
23 }
24
25 private:
26 DISALLOW_COPY_AND_ASSIGN(ProcessesApiTest);
27 };
28
29 IN_PROC_BROWSER_TEST_F(ProcessesApiTest, Processes) {
19 ASSERT_TRUE(RunExtensionTest("processes/api")) << message_; 30 ASSERT_TRUE(RunExtensionTest("processes/api")) << message_;
20 } 31 }
21 32
22 IN_PROC_BROWSER_TEST_F(ProcessesApiTest, ProcessesVsTaskManager) { 33 IN_PROC_BROWSER_TEST_F(ProcessesApiTest, ProcessesApiListeners) {
23 // This test is for the old implementation of the task manager. We must 34 EXPECT_EQ(0, GetListenersCount());
24 // explicitly disable the new one.
25 task_manager::browsertest_util::EnableOldTaskManager();
26 35
27 // Ensure task manager is not yet updating 36 // Load extension that adds a listener in background page
28 TaskManagerModel* model = TaskManager::GetInstance()->model(); 37 ExtensionTestMessageListener listener1("ready", false /* will_reply */);
29 EXPECT_EQ(0, model->update_requests_); 38 const extensions::Extension* extension1 = LoadExtension(
30 EXPECT_EQ(TaskManagerModel::IDLE, model->update_state_); 39 test_data_dir_.AppendASCII("processes").AppendASCII("onupdated"));
40 ASSERT_TRUE(extension1);
41 ASSERT_TRUE(listener1.WaitUntilSatisfied());
31 42
32 // Load extension that adds listener in background page 43 // The memory refresh type of the task manager may or may not be enabled by
33 ExtensionTestMessageListener listener("ready", false); 44 // now depending on the presence of other task manager observers.
34 ASSERT_TRUE(LoadExtension( 45 // Ensure the listeners count has changed.
35 test_data_dir_.AppendASCII("processes").AppendASCII("onupdated"))); 46 EXPECT_EQ(1, GetListenersCount());
36 ASSERT_TRUE(listener.WaitUntilSatisfied());
37 47
38 // Ensure the task manager has started updating 48 // Load another extension that listen to the onUpdatedWithMemory.
39 EXPECT_EQ(1, model->update_requests_); 49 ExtensionTestMessageListener listener2("ready", false /* will_reply */);
40 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_); 50 const extensions::Extension* extension2 = LoadExtension(
51 test_data_dir_.AppendASCII("processes").AppendASCII(
52 "onupdated_with_memory"));
53 ASSERT_TRUE(extension2);
54 ASSERT_TRUE(listener2.WaitUntilSatisfied());
41 55
42 // Now show the task manager and wait for it to be ready 56 // The memory refresh type must be enabled now.
43 chrome::ShowTaskManager(browser()); 57 const task_management::TaskManagerInterface* task_manager =
58 task_management::TaskManagerInterface::GetTaskManager();
59 EXPECT_EQ(2, GetListenersCount());
60 EXPECT_TRUE(task_manager->IsResourceRefreshEnabled(
61 task_management::REFRESH_TYPE_MEMORY));
44 62
45 EXPECT_EQ(2, model->update_requests_); 63 // Unload the extensions and make sure the listeners count is updated.
46 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_); 64 UnloadExtension(extension2->id());
47 65 EXPECT_EQ(1, GetListenersCount());
48 // Unload the extension and check that listener count decreases 66 UnloadExtension(extension1->id());
49 UnloadExtension(last_loaded_extension_id()); 67 EXPECT_EQ(0, GetListenersCount());
50 EXPECT_EQ(1, model->update_requests_);
51 } 68 }
52 69
53 IN_PROC_BROWSER_TEST_F(ProcessesApiTest, CannotTerminateBrowserProcess) { 70 IN_PROC_BROWSER_TEST_F(ProcessesApiTest, CannotTerminateBrowserProcess) {
54 ASSERT_TRUE(RunExtensionTest("processes/terminate-browser-process")) 71 ASSERT_TRUE(RunExtensionTest("processes/terminate-browser-process"))
55 << message_; 72 << message_;
56 } 73 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/processes/processes_api.cc ('k') | chrome/browser/extensions/api/tabs/tabs_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698