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

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

Issue 12712018: Fixing problem with incomplete browser windows showing up after task manager was used (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed again. Done. Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | 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) 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/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/task_manager/task_manager_browsertest_util.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
11 #include "chrome/browser/ui/browser_dialogs.h"
11 #include "chrome/browser/ui/browser_window.h" 12 #include "chrome/browser/ui/browser_window.h"
12 #include "chrome/common/chrome_switches.h" 13 #include "chrome/common/chrome_switches.h"
13 14
14 // Sometimes times out on Mac OS and Windows 15 // Sometimes times out on Mac OS and Windows
15 // crbug.com/97499 16 // crbug.com/97499
16 // Also on Linux: crbug.com/130138 17 // Also on Linux: crbug.com/130138
17 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHR OMEOS) 18 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHR OMEOS)
18 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Processes) { 19 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Processes) {
19 #else 20 #else
20 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Processes) { 21 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Processes) {
(...skipping 21 matching lines...) Expand all
42 ExtensionTestMessageListener listener("ready", false); 43 ExtensionTestMessageListener listener("ready", false);
43 ASSERT_TRUE(LoadExtension( 44 ASSERT_TRUE(LoadExtension(
44 test_data_dir_.AppendASCII("processes").AppendASCII("onupdated"))); 45 test_data_dir_.AppendASCII("processes").AppendASCII("onupdated")));
45 ASSERT_TRUE(listener.WaitUntilSatisfied()); 46 ASSERT_TRUE(listener.WaitUntilSatisfied());
46 47
47 // Ensure the task manager has started updating 48 // Ensure the task manager has started updating
48 EXPECT_EQ(1, model->update_requests_); 49 EXPECT_EQ(1, model->update_requests_);
49 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_); 50 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_);
50 51
51 // Now show the task manager and wait for it to be ready 52 // Now show the task manager and wait for it to be ready
52 TaskManagerBrowserTestUtil::ShowTaskManagerAndWaitForReady(browser()); 53 chrome::ShowTaskManager(browser(), false);
53 54
54 EXPECT_EQ(2, model->update_requests_); 55 EXPECT_EQ(2, model->update_requests_);
55 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_); 56 EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_);
56 57
57 // Unload the extension and check that listener count decreases 58 // Unload the extension and check that listener count decreases
58 UnloadExtension(last_loaded_extension_id_); 59 UnloadExtension(last_loaded_extension_id_);
59 EXPECT_EQ(1, model->update_requests_); 60 EXPECT_EQ(1, model->update_requests_);
60 } 61 }
61 62
62 #endif 63 #endif
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/prerender/prerender_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698