| Index: chrome/browser/ui/browser_navigator_browsertest.cc
|
| diff --git a/chrome/browser/ui/browser_navigator_browsertest.cc b/chrome/browser/ui/browser_navigator_browsertest.cc
|
| index 1fd1cda732fcb9e1abb358bed61b3b3dc782d16f..a061a20ec182d0a2a924f8a3eb4dd276b7345cbb 100644
|
| --- a/chrome/browser/ui/browser_navigator_browsertest.cc
|
| +++ b/chrome/browser/ui/browser_navigator_browsertest.cc
|
| @@ -1194,8 +1194,14 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
|
| browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
|
| }
|
|
|
| +// TODO(linux_aura) http://crbug.com/163931
|
| +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
|
| +#define MAYBE_NavigateFromDefaultToBookmarksInSameTab DISABLED_NavigateFromDefaultToBookmarksInSameTab
|
| +#else
|
| +#define MAYBE_NavigateFromDefaultToBookmarksInSameTab NavigateFromDefaultToBookmarksInSameTab
|
| +#endif
|
| IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
|
| - NavigateFromDefaultToBookmarksInSameTab) {
|
| + MAYBE_NavigateFromDefaultToBookmarksInSameTab) {
|
| {
|
| content::WindowedNotificationObserver observer(
|
| content::NOTIFICATION_LOAD_STOP,
|
|
|