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

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: Rebase ... 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_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 class ProcessesApiTest : public ExtensionApiTest {
16 public:
17 ProcessesApiTest() {}
18 ~ProcessesApiTest() override {}
19
20 int GetListenersCount() {
21 return extensions::ProcessesAPI::Get(profile())->
22 processes_event_router()->listeners_;
23 }
24
25 private:
26 DISALLOW_COPY_AND_ASSIGN(ProcessesApiTest);
27 };
16 28
17 IN_PROC_BROWSER_TEST_F(ProcessesApiTest, Processes) { 29 IN_PROC_BROWSER_TEST_F(ProcessesApiTest, Processes) {
18 ASSERT_TRUE(RunExtensionTest("processes/api")) << message_; 30 ASSERT_TRUE(RunExtensionTest("processes/api")) << message_;
19 } 31 }
20 32
21 IN_PROC_BROWSER_TEST_F(ProcessesApiTest, ProcessesVsTaskManager) { 33 IN_PROC_BROWSER_TEST_F(ProcessesApiTest, ProcessesApiListeners) {
Devlin 2016/03/03 23:12:43 I'm honestly not sure how useful this test is as i
afakhry 2016/03/08 01:37:29 I added another listener for onUpdatedWithMemory a
22 // This test is for the old implementation of the task manager. We must 34 EXPECT_EQ(0, GetListenersCount());
23 // explicitly disable the new one.
24 task_manager::browsertest_util::EnableOldTaskManager();
25
26 // Ensure task manager is not yet updating
27 TaskManagerModel* model = TaskManager::GetInstance()->model();
28 EXPECT_EQ(0, model->update_requests_);
29 EXPECT_EQ(TaskManagerModel::IDLE, model->update_state_);
30 35
31 // Load extension that adds listener in background page 36 // Load extension that adds listener in background page
32 ExtensionTestMessageListener listener("ready", false); 37 ExtensionTestMessageListener listener("ready", false);
33 ASSERT_TRUE(LoadExtension( 38 ASSERT_TRUE(LoadExtension(
34 test_data_dir_.AppendASCII("processes").AppendASCII("onupdated"))); 39 test_data_dir_.AppendASCII("processes").AppendASCII("onupdated")));
35 ASSERT_TRUE(listener.WaitUntilSatisfied()); 40 ASSERT_TRUE(listener.WaitUntilSatisfied());
36 41
37 // Ensure the task manager has started updating 42 // Ensure the listeners count has changed.
38 EXPECT_EQ(1, model->update_requests_); 43 EXPECT_EQ(1, GetListenersCount());
39 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_);
40
41 // Now show the task manager and wait for it to be ready
42 chrome::ShowTaskManager(browser());
43
44 EXPECT_EQ(2, model->update_requests_);
45 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_);
46 44
47 // Unload the extension and check that listener count decreases 45 // Unload the extension and check that listener count decreases
48 UnloadExtension(last_loaded_extension_id()); 46 UnloadExtension(last_loaded_extension_id());
49 EXPECT_EQ(1, model->update_requests_); 47
48 EXPECT_EQ(0, GetListenersCount());
50 } 49 }
51 50
52 IN_PROC_BROWSER_TEST_F(ProcessesApiTest, CannotTerminateBrowserProcess) { 51 IN_PROC_BROWSER_TEST_F(ProcessesApiTest, CannotTerminateBrowserProcess) {
53 ASSERT_TRUE(RunExtensionTest("processes/terminate-browser-process")) 52 ASSERT_TRUE(RunExtensionTest("processes/terminate-browser-process"))
54 << message_; 53 << message_;
55 } 54 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698