| Index: chrome/browser/ui/toolbar/browser_actions_bar_browsertest.cc
|
| diff --git a/chrome/browser/ui/toolbar/browser_actions_bar_browsertest.cc b/chrome/browser/ui/toolbar/browser_actions_bar_browsertest.cc
|
| index 4824b5a2f872661b88f1c9a23f18be81ca4b7d91..01b3dd3e01e36d0748d3ee29e2efcf8a616ba976 100644
|
| --- a/chrome/browser/ui/toolbar/browser_actions_bar_browsertest.cc
|
| +++ b/chrome/browser/ui/toolbar/browser_actions_bar_browsertest.cc
|
| @@ -335,7 +335,14 @@ IN_PROC_BROWSER_TEST_F(BrowserActionsBarRedesignBrowserTest,
|
| EXPECT_FALSE(browser_actions_bar()->OverflowedActionButtonWantsToRun());
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(BrowserActionsBarBrowserTest, BrowserActionPopupTest) {
|
| +// Flaky on Mac ASan 64 bot. See http://crbug.com/498665.
|
| +#if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER)
|
| +#define MAYBE_BrowserActionPopupTest DISABLED_BrowserActionPopupTest
|
| +#else
|
| +#define MAYBE_BrowserActionPopupTest BrowserActionPopupTest
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(BrowserActionsBarBrowserTest,
|
| + MAYBE_BrowserActionPopupTest) {
|
| // Load up two extensions that have browser action popups.
|
| base::FilePath data_dir =
|
| test_data_dir_.AppendASCII("api_test").AppendASCII("browser_action");
|
|
|