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

Side by Side Diff: chrome/browser/extensions/extension_processes_apitest.cc

Issue 7520011: WebUI TaskManager: make it default on Chrome OS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 5 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/browser_window.h" 11 #include "chrome/browser/ui/browser_window.h"
11 #include "chrome/common/chrome_switches.h" 12 #include "chrome/common/chrome_switches.h"
12 13
13 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Processes) { 14 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Processes) {
14 CommandLine::ForCurrentProcess()->AppendSwitch( 15 CommandLine::ForCurrentProcess()->AppendSwitch(
15 switches::kEnableExperimentalExtensionApis); 16 switches::kEnableExperimentalExtensionApis);
16 17
17 ASSERT_TRUE(RunExtensionTest("processes/api")) << message_; 18 ASSERT_TRUE(RunExtensionTest("processes/api")) << message_;
18 } 19 }
(...skipping 10 matching lines...) Expand all
29 // Load extension that adds listener in background page 30 // Load extension that adds listener in background page
30 ExtensionTestMessageListener listener("ready", false); 31 ExtensionTestMessageListener listener("ready", false);
31 ASSERT_TRUE(LoadExtension( 32 ASSERT_TRUE(LoadExtension(
32 test_data_dir_.AppendASCII("processes").AppendASCII("onupdated"))); 33 test_data_dir_.AppendASCII("processes").AppendASCII("onupdated")));
33 ASSERT_TRUE(listener.WaitUntilSatisfied()); 34 ASSERT_TRUE(listener.WaitUntilSatisfied());
34 35
35 // Ensure the task manager has started updating 36 // Ensure the task manager has started updating
36 EXPECT_EQ(1, model->update_requests_); 37 EXPECT_EQ(1, model->update_requests_);
37 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_); 38 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_);
38 39
39 // Now show the task manager 40 // Now show the task manager and wait for it to be ready
40 browser()->window()->ShowTaskManager(); 41 TaskManagerBrowserTestUtil::ShowTaskManagerAndWaitForReady(browser());
42
41 EXPECT_EQ(2, model->update_requests_); 43 EXPECT_EQ(2, model->update_requests_);
42 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_); 44 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_);
43 45
44 // Unload the extension and check that listener count decreases 46 // Unload the extension and check that listener count decreases
45 UnloadExtension(last_loaded_extension_id_); 47 UnloadExtension(last_loaded_extension_id_);
46 EXPECT_EQ(1, model->update_requests_); 48 EXPECT_EQ(1, model->update_requests_);
47 } 49 }
48 50
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698