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

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

Issue 1293813005: Change the new-task-manager flag so that the new implementation is enabled by default for all users. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing old TM browser tests Created 5 years, 4 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/extension_apitest.h" 6 #include "chrome/browser/extensions/extension_apitest.h"
7 #include "chrome/browser/task_manager/task_manager.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 // Test is flaky: http://crbug.com/346990 15 // Test is flaky: http://crbug.com/346990
16 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Processes) { 16 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Processes) {
17 ASSERT_TRUE(RunExtensionTest("processes/api")) << message_; 17 ASSERT_TRUE(RunExtensionTest("processes/api")) << message_;
18 } 18 }
19 19
20 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ProcessesVsTaskManager) { 20 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ProcessesVsTaskManager) {
21 // This test is for the old implementation of the task manager. We must
22 // explicitly disable the new one.
23 task_manager::browsertest_util::EnableOldTaskManager();
24
21 // Ensure task manager is not yet updating 25 // Ensure task manager is not yet updating
22 TaskManagerModel* model = TaskManager::GetInstance()->model(); 26 TaskManagerModel* model = TaskManager::GetInstance()->model();
23 EXPECT_EQ(0, model->update_requests_); 27 EXPECT_EQ(0, model->update_requests_);
24 EXPECT_EQ(TaskManagerModel::IDLE, model->update_state_); 28 EXPECT_EQ(TaskManagerModel::IDLE, model->update_state_);
25 29
26 // Load extension that adds listener in background page 30 // Load extension that adds listener in background page
27 ExtensionTestMessageListener listener("ready", false); 31 ExtensionTestMessageListener listener("ready", false);
28 ASSERT_TRUE(LoadExtension( 32 ASSERT_TRUE(LoadExtension(
29 test_data_dir_.AppendASCII("processes").AppendASCII("onupdated"))); 33 test_data_dir_.AppendASCII("processes").AppendASCII("onupdated")));
30 ASSERT_TRUE(listener.WaitUntilSatisfied()); 34 ASSERT_TRUE(listener.WaitUntilSatisfied());
31 35
32 // Ensure the task manager has started updating 36 // Ensure the task manager has started updating
33 EXPECT_EQ(1, model->update_requests_); 37 EXPECT_EQ(1, model->update_requests_);
34 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_); 38 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_);
35 39
36 // Now show the task manager and wait for it to be ready 40 // Now show the task manager and wait for it to be ready
37 chrome::ShowTaskManager(browser()); 41 chrome::ShowTaskManager(browser());
38 42
39 EXPECT_EQ(2, model->update_requests_); 43 EXPECT_EQ(2, model->update_requests_);
40 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_); 44 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_);
41 45
42 // Unload the extension and check that listener count decreases 46 // Unload the extension and check that listener count decreases
43 UnloadExtension(last_loaded_extension_id()); 47 UnloadExtension(last_loaded_extension_id());
44 EXPECT_EQ(1, model->update_requests_); 48 EXPECT_EQ(1, model->update_requests_);
45 } 49 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698