Index: chrome/browser/prerender/prerender_browsertest.cc |
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc |
index 630f23916789f0a45ff437659a82c3cb15db3ad9..e2cfe01c2e0b175483c10a1bf247f310e25b9021 100644 |
--- a/chrome/browser/prerender/prerender_browsertest.cc |
+++ b/chrome/browser/prerender/prerender_browsertest.cc |
@@ -53,8 +53,6 @@ |
#include "chrome/browser/safe_browsing/safe_browsing_service.h" |
#include "chrome/browser/task_management/providers/web_contents/web_contents_tags_manager.h" |
#include "chrome/browser/task_management/task_management_browsertest_util.h" |
-#include "chrome/browser/task_manager/task_manager.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_finder.h" |
@@ -121,6 +119,11 @@ |
#include "ui/base/l10n/l10n_util.h" |
#include "url/gurl.h" |
+#if defined(OS_MACOSX) |
+#include "chrome/browser/task_manager/task_manager.h" |
+#include "chrome/browser/task_manager/task_manager_browsertest_util.h" |
+#endif // defined(OS_MACOSX) |
+ |
using chrome_browser_net::NetworkPredictionOptions; |
using content::BrowserThread; |
using content::DevToolsAgentHost; |
@@ -137,7 +140,10 @@ using net::NetworkChangeNotifier; |
using safe_browsing::LocalSafeBrowsingDatabaseManager; |
using safe_browsing::SafeBrowsingService; |
using safe_browsing::SBThreatType; |
+ |
+#if defined(OS_MACOSX) |
using task_manager::browsertest_util::WaitForTaskManagerRows; |
+#endif // defined(OS_MACOSX) |
// Prerender tests work as follows: |
// |
@@ -1360,9 +1366,11 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest { |
check_load_events_ = false; |
} |
+#if defined(OS_MACOSX) |
TaskManagerModel* GetModel() const { |
return TaskManager::GetInstance()->model(); |
} |
+#endif // defined(OS_MACOSX) |
PrerenderManager* GetPrerenderManager() const { |
PrerenderManager* prerender_manager = |
@@ -2474,11 +2482,9 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderAbortPendingOnCancel) { |
EXPECT_TRUE(IsEmptyPrerenderLinkManager()); |
} |
+// Old task manager browser tests should only run on Mac. |
tapted
2016/04/26 01:08:08
We should look into these too - someone needs to o
ncarter (slow)
2016/04/26 20:04:35
There is, actually, new-taskmanager coverage in th
afakhry
2016/04/26 22:22:43
I'm the one who wrote the new task manager with nc
|
+#if defined(OS_MACOSX) |
IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, OpenTaskManagerBeforePrerender) { |
- // This test is for the old implementation of the task manager. We must |
- // explicitly disable the new one. |
- task_manager::browsertest_util::EnableOldTaskManager(); |
- |
const base::string16 any_prerender = MatchTaskManagerPrerender("*"); |
const base::string16 any_tab = MatchTaskManagerTab("*"); |
const base::string16 original = MatchTaskManagerTab("Preloader"); |
@@ -2514,10 +2520,6 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, OpenTaskManagerBeforePrerender) { |
} |
IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, OpenTaskManagerAfterPrerender) { |
- // This test is for the old implementation of the task manager. We must |
- // explicitly disable the new one. |
- task_manager::browsertest_util::EnableOldTaskManager(); |
- |
const base::string16 any_prerender = MatchTaskManagerPrerender("*"); |
const base::string16 any_tab = MatchTaskManagerTab("*"); |
const base::string16 original = MatchTaskManagerTab("Preloader"); |
@@ -2552,10 +2554,6 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, OpenTaskManagerAfterPrerender) { |
} |
IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, OpenTaskManagerAfterSwapIn) { |
- // This test is for the old implementation of the task manager. We must |
- // explicitly disable the new one. |
- task_manager::browsertest_util::EnableOldTaskManager(); |
- |
const base::string16 any_prerender = MatchTaskManagerPrerender("*"); |
const base::string16 any_tab = MatchTaskManagerTab("*"); |
const base::string16 final = MatchTaskManagerTab("Prerender Page"); |
@@ -2574,6 +2572,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, OpenTaskManagerAfterSwapIn) { |
ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, any_tab)); |
ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, any_prerender)); |
} |
+#endif // defined(OS_MACOSX) |
// Checks that audio loads are deferred on prerendering. |
IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHTML5Audio) { |