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..bdc09104a70c5cbb219a2afdd24329f79f523ced 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" |
@@ -23,17 +22,15 @@ |
#include "content/public/test/test_utils.h" |
#include "url/url_constants.h" |
+#if defined(OS_MACOSX) |
+#include "chrome/browser/task_manager/task_manager_browsertest_util.h" |
+#endif // defined(OS_MACOSX) |
+ |
#if defined(OS_WIN) |
#include "ui/aura/window.h" |
#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,17 +81,16 @@ 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(); |
+// Old task manager browser tests should only run on Mac. |
+#if defined(OS_MACOSX) |
+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; |
+// Disable the test for mac, see http://crbug/367665. |
+IN_PROC_BROWSER_TEST_F(PrintPreviewTest, DISABLED_TaskManagerNewPrintPreview) { |
chrome::ShowTaskManager(browser()); // Show task manager BEFORE print dialog. |
ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab())); |
@@ -114,10 +110,6 @@ IN_PROC_BROWSER_TEST_F(PrintPreviewTest, MAYBE_TaskManagerNewPrintPreview) { |
// 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(); |
@@ -129,6 +121,7 @@ IN_PROC_BROWSER_TEST_F(PrintPreviewTest, |
ASSERT_NO_FATAL_FAILURE( |
WaitForTaskManagerRows(1, MatchPrint(url::kAboutBlankURL))); |
} |
+#endif // defined(OS_MACOSX) |
#if defined(OS_WIN) |
// http://crbug.com/396360 |