Migrate ProcessesEventRouter to the new task manager

chrome/browser/extensions/api/processes/processes_apitest.cc

Index: chrome/browser/extensions/api/processes/processes_apitest.cc
diff --git a/chrome/browser/extensions/api/processes/processes_apitest.cc b/chrome/browser/extensions/api/processes/processes_apitest.cc
index 934f33c1a37d34aabe0466bbb19014b618d7c311..3b3e694e7f592a6a9b7e082aad471be4cf696c7e 100644
--- a/chrome/browser/extensions/api/processes/processes_apitest.cc
+++ b/chrome/browser/extensions/api/processes/processes_apitest.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "base/command_line.h"
+#include "chrome/browser/extensions/api/processes/processes_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
-#include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/browser/task_manager/task_manager_browsertest_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
@@ -12,20 +12,27 @@
 #include "extensions/common/switches.h"
 #include "extensions/test/extension_test_message_listener.h"
 
+class ProccessesApiTest : public ExtensionApiTest {
+ public:
+  ProccessesApiTest() {}
+  ~ProccessesApiTest() override {}
+
+  int GetListenersCount() {
+    return extensions::ProcessesAPI::Get(profile())->
+        processes_event_router()->listeners_;
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ProccessesApiTest);
+};
+
 // Test is flaky: http://crbug.com/346990
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Processes) {
+IN_PROC_BROWSER_TEST_F(ProccessesApiTest, Processes) {
   ASSERT_TRUE(RunExtensionTest("processes/api")) << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ProcessesVsTaskManager) {
-  // This test is for the old implementation of the task manager. We must
-  // explicitly disable the new one.
-  task_manager::browsertest_util::EnableOldTaskManager();
-
-  // Ensure task manager is not yet updating
-  TaskManagerModel* model = TaskManager::GetInstance()->model();
-  EXPECT_EQ(0, model->update_requests_);
-  EXPECT_EQ(TaskManagerModel::IDLE, model->update_state_);
+IN_PROC_BROWSER_TEST_F(ProccessesApiTest, ProcessesApiListeners) {
+  EXPECT_EQ(0, GetListenersCount());
 
   // Load extension that adds listener in background page
   ExtensionTestMessageListener listener("ready", false);
@@ -33,22 +40,16 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ProcessesVsTaskManager) {
       test_data_dir_.AppendASCII("processes").AppendASCII("onupdated")));
   ASSERT_TRUE(listener.WaitUntilSatisfied());
 
-  // Ensure the task manager has started updating
-  EXPECT_EQ(1, model->update_requests_);
-  EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_);
-
-  // Now show the task manager and wait for it to be ready
-  chrome::ShowTaskManager(browser());
-
-  EXPECT_EQ(2, model->update_requests_);
-  EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_);
+  // Ensure the listeners count has changed.
+  EXPECT_EQ(1, GetListenersCount());
 
   // Unload the extension and check that listener count decreases
   UnloadExtension(last_loaded_extension_id());
-  EXPECT_EQ(1, model->update_requests_);
+
+  EXPECT_EQ(0, GetListenersCount());
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CannotTerminateBrowserProcess) {
+IN_PROC_BROWSER_TEST_F(ProccessesApiTest, CannotTerminateBrowserProcess) {
   ASSERT_TRUE(RunExtensionTest("processes/terminate-browser-process"))
       << message_;
 }