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

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

Issue 7537045: Revert 95015 - WebUI TaskManager: make it default on Chrome OS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/prerender/prerender_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
10 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
11 #include "chrome/browser/ui/browser_window.h" 10 #include "chrome/browser/ui/browser_window.h"
12 #include "chrome/common/chrome_switches.h" 11 #include "chrome/common/chrome_switches.h"
13 12
14 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Processes) { 13 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Processes) {
15 CommandLine::ForCurrentProcess()->AppendSwitch( 14 CommandLine::ForCurrentProcess()->AppendSwitch(
16 switches::kEnableExperimentalExtensionApis); 15 switches::kEnableExperimentalExtensionApis);
17 16
18 ASSERT_TRUE(RunExtensionTest("processes/api")) << message_; 17 ASSERT_TRUE(RunExtensionTest("processes/api")) << message_;
19 } 18 }
(...skipping 10 matching lines...) Expand all
30 // Load extension that adds listener in background page 29 // Load extension that adds listener in background page
31 ExtensionTestMessageListener listener("ready", false); 30 ExtensionTestMessageListener listener("ready", false);
32 ASSERT_TRUE(LoadExtension( 31 ASSERT_TRUE(LoadExtension(
33 test_data_dir_.AppendASCII("processes").AppendASCII("onupdated"))); 32 test_data_dir_.AppendASCII("processes").AppendASCII("onupdated")));
34 ASSERT_TRUE(listener.WaitUntilSatisfied()); 33 ASSERT_TRUE(listener.WaitUntilSatisfied());
35 34
36 // Ensure the task manager has started updating 35 // Ensure the task manager has started updating
37 EXPECT_EQ(1, model->update_requests_); 36 EXPECT_EQ(1, model->update_requests_);
38 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_); 37 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_);
39 38
40 // Now show the task manager and wait for it to be ready 39 // Now show the task manager
41 TaskManagerBrowserTestUtil::ShowTaskManagerAndWaitForReady(browser()); 40 browser()->window()->ShowTaskManager();
42
43 EXPECT_EQ(2, model->update_requests_); 41 EXPECT_EQ(2, model->update_requests_);
44 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_); 42 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_);
45 43
46 // Unload the extension and check that listener count decreases 44 // Unload the extension and check that listener count decreases
47 UnloadExtension(last_loaded_extension_id_); 45 UnloadExtension(last_loaded_extension_id_);
48 EXPECT_EQ(1, model->update_requests_); 46 EXPECT_EQ(1, model->update_requests_);
49 } 47 }
50 48
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/prerender/prerender_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698