| Index: chrome/browser/extensions/subscribe_page_action_browsertest.cc
|
| diff --git a/chrome/browser/extensions/subscribe_page_action_browsertest.cc b/chrome/browser/extensions/subscribe_page_action_browsertest.cc
|
| index 3b077f8aa8f1cac6227a2f207eb6f6b25f208694..4c6d950ffb4f84bd96063294858f2aef60a922fd 100644
|
| --- a/chrome/browser/extensions/subscribe_page_action_browsertest.cc
|
| +++ b/chrome/browser/extensions/subscribe_page_action_browsertest.cc
|
| @@ -163,7 +163,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedValidFeed1) {
|
| "No error");
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedValidFeed2) {
|
| +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
|
| +// TODO(erg): linux_aura bringup: http://crbug.com/163931
|
| +#define MAYBE_ParseFeedValidFeed2 DISABLED_ParseFeedValidFeed2
|
| +#else
|
| +#define MAYBE_ParseFeedValidFeed2 ParseFeedValidFeed2
|
| +#endif
|
| +
|
| +IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_ParseFeedValidFeed2) {
|
| ASSERT_TRUE(test_server()->Start());
|
|
|
| const Extension* extension = LoadExtension(
|
| @@ -208,7 +215,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedValidFeed4) {
|
| "No error");
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedValidFeed0) {
|
| +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
|
| +// TODO(erg): linux_aura bringup: http://crbug.com/163931
|
| +#define MAYBE_ParseFeedValidFeed0 DISABLED_ParseFeedValidFeed0
|
| +#else
|
| +#define MAYBE_ParseFeedValidFeed0 ParseFeedValidFeed0
|
| +#endif
|
| +
|
| +IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_ParseFeedValidFeed0) {
|
| ASSERT_TRUE(test_server()->Start());
|
|
|
| const Extension* extension = LoadExtension(
|
|
|