Index: chrome/browser/apps/guest_view/web_view_browsertest.cc |
diff --git a/chrome/browser/apps/guest_view/web_view_browsertest.cc b/chrome/browser/apps/guest_view/web_view_browsertest.cc |
index a599e2b93f85ccf5a58b95411842aba078667b0d..c8f2b2a482880d5327b3de3c53c770f05e06c250 100644 |
--- a/chrome/browser/apps/guest_view/web_view_browsertest.cc |
+++ b/chrome/browser/apps/guest_view/web_view_browsertest.cc |
@@ -26,7 +26,6 @@ |
#include "chrome/browser/renderer_context_menu/render_view_context_menu.h" |
#include "chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h" |
#include "chrome/browser/task_management/task_management_browsertest_util.h" |
-#include "chrome/browser/task_manager/task_manager_browsertest_util.h" |
#include "chrome/browser/ui/browser.h" |
#include "chrome/browser/ui/browser_dialogs.h" |
#include "chrome/browser/ui/tabs/tab_strip_model.h" |
@@ -86,6 +85,10 @@ |
#include "chrome/browser/chromeos/accessibility/speech_monitor.h" |
#endif |
+#if defined(OS_MACOSX) |
+#include "chrome/browser/task_manager/task_manager_browsertest_util.h" |
+#endif // defined(OS_MACOSX) |
+ |
using extensions::ContextMenuMatcher; |
using extensions::ExtensionsAPIClient; |
using extensions::MenuItem; |
@@ -94,6 +97,9 @@ using guest_view::TestGuestViewManager; |
using guest_view::TestGuestViewManagerFactory; |
using prerender::PrerenderLinkManager; |
using prerender::PrerenderLinkManagerFactory; |
+using ui::MenuModel; |
+ |
+#if defined(OS_MACOSX) |
using task_manager::browsertest_util::MatchAboutBlankTab; |
using task_manager::browsertest_util::MatchAnyApp; |
using task_manager::browsertest_util::MatchAnyBackground; |
@@ -103,7 +109,7 @@ using task_manager::browsertest_util::MatchApp; |
using task_manager::browsertest_util::MatchBackground; |
using task_manager::browsertest_util::MatchWebView; |
using task_manager::browsertest_util::WaitForTaskManagerRows; |
-using ui::MenuModel; |
+#endif // defined(OS_MACOSX) |
namespace { |
const char kEmptyResponsePath[] = "/close-socket"; |
@@ -1480,13 +1486,11 @@ IN_PROC_BROWSER_TEST_P(WebViewTest, NoPrerenderer) { |
EXPECT_TRUE(prerender_link_manager->IsEmpty()); |
} |
+// Old Task manager browser tests should only run on mac. |
+#if defined(OS_MACOSX) |
// Verify that existing <webview>'s are detected when the task manager starts |
// up. |
IN_PROC_BROWSER_TEST_P(WebViewTest, TaskManagerExistingWebView) { |
- // This test is for the old implementation of the task manager. We must |
- // explicitly disable the new one. |
- task_manager::browsertest_util::EnableOldTaskManager(); |
- |
ASSERT_TRUE(StartEmbeddedTestServer()); |
LoadGuest("/extensions/platform_apps/web_view/task_manager/guest.html", |
@@ -1509,10 +1513,6 @@ IN_PROC_BROWSER_TEST_P(WebViewTest, TaskManagerExistingWebView) { |
// Verify that the task manager notices the creation of new <webview>'s. |
IN_PROC_BROWSER_TEST_P(WebViewTest, TaskManagerNewWebView) { |
- // This test is for the old implementation of the task manager. We must |
- // explicitly disable the new one. |
- task_manager::browsertest_util::EnableOldTaskManager(); |
- |
ASSERT_TRUE(StartEmbeddedTestServer()); |
chrome::ShowTaskManager(browser()); // Show task manager BEFORE guest loads. |
@@ -1532,6 +1532,7 @@ IN_PROC_BROWSER_TEST_P(WebViewTest, TaskManagerNewWebView) { |
ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyApp())); |
ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyBackground())); |
} |
+#endif // defined(OS_MACOSX) |
// This tests cookie isolation for packaged apps with webview tags. It navigates |
// the main browser window to a page that sets a cookie and loads an app with |