| Index: chrome/browser/extensions/api/automation/automation_apitest.cc
|
| diff --git a/chrome/browser/extensions/api/automation/automation_apitest.cc b/chrome/browser/extensions/api/automation/automation_apitest.cc
|
| index c05e1239dbd0ae0d65ff99332f4cce63198f27e1..d181c45b37565067d9c3a41f9189fbce372a1d99 100644
|
| --- a/chrome/browser/extensions/api/automation/automation_apitest.cc
|
| +++ b/chrome/browser/extensions/api/automation/automation_apitest.cc
|
| @@ -89,7 +89,7 @@ IN_PROC_BROWSER_TEST_F(AutomationApiTest, TestRendererAccessibilityEnabled) {
|
| }
|
|
|
| #if defined(ADDRESS_SANITIZER)
|
| -#define Maybe_SanityCheck DISABLED_SanityCheck
|
| +#define Maybe_SanityCheck SanityCheck
|
| #else
|
| #define Maybe_SanityCheck SanityCheck
|
| #endif
|
| @@ -105,7 +105,7 @@ IN_PROC_BROWSER_TEST_F(AutomationApiTest, Unit) {
|
| }
|
|
|
| // Test is failing on ASAN bots, crbug.com/379927
|
| -IN_PROC_BROWSER_TEST_F(AutomationApiTest, DISABLED_GetTreeByTabId) {
|
| +IN_PROC_BROWSER_TEST_F(AutomationApiTest, GetTreeByTabId) {
|
| StartEmbeddedTestServer();
|
| ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "tab_id.html"))
|
| << message_;
|
| @@ -113,7 +113,7 @@ IN_PROC_BROWSER_TEST_F(AutomationApiTest, DISABLED_GetTreeByTabId) {
|
|
|
| #if defined(OS_LINUX) && defined(ADDRESS_SANITIZER)
|
| // Failing on Linux ASan bot: http://crbug.com/391279
|
| -#define MAYBE_Events DISABLED_Events
|
| +#define MAYBE_Events Events
|
| #else
|
| #define MAYBE_Events Events
|
| #endif
|
| @@ -126,7 +126,7 @@ IN_PROC_BROWSER_TEST_F(AutomationApiTest, MAYBE_Events) {
|
|
|
| #if defined(OS_LINUX) && defined(ADDRESS_SANITIZER)
|
| // Timing out on linux ASan bot: http://crbug.com/385701
|
| -#define MAYBE_Actions DISABLED_Actions
|
| +#define MAYBE_Actions Actions
|
| #else
|
| #define MAYBE_Actions Actions
|
| #endif
|
| @@ -138,7 +138,7 @@ IN_PROC_BROWSER_TEST_F(AutomationApiTest, MAYBE_Actions) {
|
| }
|
|
|
| #if defined(ADDRESS_SANITIZER)
|
| -#define Maybe_Location DISABLED_Location
|
| +#define Maybe_Location Location
|
| #else
|
| #define Maybe_Location Location
|
| #endif
|
| @@ -157,7 +157,7 @@ IN_PROC_BROWSER_TEST_F(AutomationApiTest, TabsAutomationBooleanPermissions) {
|
|
|
| // See crbug.com/384673
|
| #if defined(ADDRESS_SANITIZER) || defined(OS_CHROMEOS) || defined(OS_LINUX)
|
| -#define Maybe_TabsAutomationBooleanActions DISABLED_TabsAutomationBooleanActions
|
| +#define Maybe_TabsAutomationBooleanActions TabsAutomationBooleanActions
|
| #else
|
| #define Maybe_TabsAutomationBooleanActions TabsAutomationBooleanActions
|
| #endif
|
|
|