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

Unified Diff: chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc

Issue 1924683003: [making a diff] Remove the old task manager view (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: delete disabled tests Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc
index 6e3b6934a25d7f8887634d48ed47c6af50c17e3b..6b4585c70bd2d5a6f22903dab605a57f544d5940 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc
@@ -6,7 +6,6 @@
#include "build/build_config.h"
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/task_manager/task_manager_browsertest_util.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/browser_dialogs.h"
@@ -28,12 +27,6 @@
#include "ui/aura/window_tree_host.h"
#endif
-using task_manager::browsertest_util::MatchAboutBlankTab;
-using task_manager::browsertest_util::MatchAnyPrint;
-using task_manager::browsertest_util::MatchAnyTab;
-using task_manager::browsertest_util::MatchPrint;
-using task_manager::browsertest_util::WaitForTaskManagerRows;
-
namespace {
class PrintPreviewTest : public InProcessBrowserTest {
@@ -84,52 +77,6 @@ IN_PROC_BROWSER_TEST_F(PrintPreviewTest, PrintCommands) {
chrome::IsCommandEnabled(browser(), IDC_BASIC_PRINT));
}
-// Disable the test for mac, see http://crbug/367665.
-#if defined(OS_MACOSX) || defined(OS_LINUX)
-#define MAYBE_TaskManagerNewPrintPreview DISABLED_TaskManagerNewPrintPreview
-#else
-#define MAYBE_TaskManagerNewPrintPreview TaskManagerNewPrintPreview
-#endif
-IN_PROC_BROWSER_TEST_F(PrintPreviewTest, MAYBE_TaskManagerNewPrintPreview) {
- // This test is for the old implementation of the task manager. We must
- // explicitly disable the new one.
- task_manager::browsertest_util::EnableOldTaskManager();
-
- chrome::ShowTaskManager(browser()); // Show task manager BEFORE print dialog.
-
- ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab()));
- ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
- ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnyPrint()));
-
- // Create the print preview dialog.
- Print();
-
- ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab()));
- ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
- ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyPrint()));
- ASSERT_NO_FATAL_FAILURE(
- WaitForTaskManagerRows(1, MatchPrint(url::kAboutBlankURL)));
-}
-
-// http://crbug/367665.
-IN_PROC_BROWSER_TEST_F(PrintPreviewTest,
- DISABLED_TaskManagerExistingPrintPreview) {
- // This test is for the old implementation of the task manager. We must
- // explicitly disable the new one.
- task_manager::browsertest_util::EnableOldTaskManager();
-
- // Create the print preview dialog.
- Print();
-
- chrome::ShowTaskManager(browser()); // Show task manager AFTER print dialog.
-
- ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab()));
- ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
- ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyPrint()));
- ASSERT_NO_FATAL_FAILURE(
- WaitForTaskManagerRows(1, MatchPrint(url::kAboutBlankURL)));
-}
-
#if defined(OS_WIN)
// http://crbug.com/396360
IN_PROC_BROWSER_TEST_F(PrintPreviewTest, DISABLED_NoCrashOnCloseWithOtherTabs) {

Powered by Google App Engine
This is Rietveld 408576698