| 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 ab0b97faf2b7e726778df08e935c93247ee940c2..692df7bceb87b0f22e6db2847df1a71ba5936111 100644
|
| --- a/chrome/browser/extensions/api/automation/automation_apitest.cc
|
| +++ b/chrome/browser/extensions/api/automation/automation_apitest.cc
|
| @@ -110,7 +110,14 @@ IN_PROC_BROWSER_TEST_F(AutomationApiTest, Events) {
|
| << message_;
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(AutomationApiTest, Actions) {
|
| +#if defined(OS_LINUX) && defined(ADDRESS_SANITIZER)
|
| +// Timing out on linux ASan bot: http://crbug.com/385701
|
| +#define MAYBE_Actions DISABLED_Actions
|
| +#else
|
| +#define MAYBE_Actions Actions
|
| +#endif
|
| +
|
| +IN_PROC_BROWSER_TEST_F(AutomationApiTest, MAYBE_Actions) {
|
| StartEmbeddedTestServer();
|
| ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "actions.html"))
|
| << message_;
|
|
|