| OLD | NEW |
| 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 "chrome/browser/task_manager/task_manager.h" | 5 #include "chrome/browser/task_manager/task_manager.h" |
| 6 | 6 |
| 7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
| 8 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
| (...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 200 TaskManager::GetInstance()->KillProcess(tab); | 200 TaskManager::GetInstance()->KillProcess(tab); |
| 201 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchTab("title1.html"))); | 201 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchTab("title1.html"))); |
| 202 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); | 202 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); |
| 203 | 203 |
| 204 // Tab should reappear in task manager upon reload. | 204 // Tab should reappear in task manager upon reload. |
| 205 chrome::Reload(browser(), CURRENT_TAB); | 205 chrome::Reload(browser(), CURRENT_TAB); |
| 206 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("title1.html"))); | 206 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("title1.html"))); |
| 207 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab())); | 207 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab())); |
| 208 } | 208 } |
| 209 | 209 |
| 210 // Test for http://crbug.com/444722, which is not fixed yet. | 210 // Test for http://crbug.com/444945, which is not fixed yet. |
| 211 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, | 211 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, |
| 212 DISABLED_NavigateAwayFromHungRenderer) { | 212 DISABLED_NavigateAwayFromHungRenderer) { |
| 213 host_resolver()->AddRule("*", "127.0.0.1"); | 213 host_resolver()->AddRule("*", "127.0.0.1"); |
| 214 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); | 214 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); |
| 215 ShowTaskManager(); | 215 ShowTaskManager(); |
| 216 | 216 |
| 217 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab())); | 217 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab())); |
| 218 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); | 218 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); |
| 219 | 219 |
| 220 GURL url1(embedded_test_server()->GetURL("/title2.html")); | 220 GURL url1(embedded_test_server()->GetURL("/title2.html")); |
| (...skipping 866 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1087 } else { | 1087 } else { |
| 1088 ASSERT_NO_FATAL_FAILURE( | 1088 ASSERT_NO_FATAL_FAILURE( |
| 1089 WaitForTaskManagerRows(0, MatchSubframe("http://b.com/"))); | 1089 WaitForTaskManagerRows(0, MatchSubframe("http://b.com/"))); |
| 1090 ASSERT_NO_FATAL_FAILURE( | 1090 ASSERT_NO_FATAL_FAILURE( |
| 1091 WaitForTaskManagerRows(1, MatchSubframe("http://c.com/"))); | 1091 WaitForTaskManagerRows(1, MatchSubframe("http://c.com/"))); |
| 1092 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnySubframe())); | 1092 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnySubframe())); |
| 1093 } | 1093 } |
| 1094 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("aac"))); | 1094 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("aac"))); |
| 1095 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); | 1095 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); |
| 1096 } | 1096 } |
| OLD | NEW |