Index: chrome/browser/extensions/api/processes/processes_apitest.cc |
diff --git a/chrome/browser/extensions/api/processes/processes_apitest.cc b/chrome/browser/extensions/api/processes/processes_apitest.cc |
index f2f5eb03d5f77d339c768c45f3c2f98b5c245af0..c42d1cbd1032ac9b47a21528ae86039b6a3ca4be 100644 |
--- a/chrome/browser/extensions/api/processes/processes_apitest.cc |
+++ b/chrome/browser/extensions/api/processes/processes_apitest.cc |
@@ -12,21 +12,10 @@ |
#include "chrome/browser/ui/browser_window.h" |
#include "extensions/common/switches.h" |
-// Sometimes times out on Mac OS and Windows |
-// crbug.com/97499 |
-// Also on Linux: crbug.com/130138 |
-#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) |
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Processes) { |
-#else |
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Processes) { |
-#endif |
ASSERT_TRUE(RunExtensionTest("processes/api")) << message_; |
} |
-// http://crbug.com/31663 |
-// TODO(linux_aura) http://crbug.com/163931 |
-#if !defined(OS_WIN) && !(defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)) |
- |
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ProcessesVsTaskManager) { |
// Ensure task manager is not yet updating |
TaskManagerModel* model = TaskManager::GetInstance()->model(); |
@@ -53,5 +42,3 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ProcessesVsTaskManager) { |
UnloadExtension(last_loaded_extension_id()); |
EXPECT_EQ(1, model->update_requests_); |
} |
- |
-#endif |