| Index: chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
|
| diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
|
| index c542d111c49ef9acf6473ec40bc9d6bd31a91488..04907864bdec0dd5a2a2052740c888ce6c1e20a2 100644
|
| --- a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
|
| +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
|
| @@ -405,7 +405,12 @@ IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, ClientRedirect) {
|
| << message_;
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, ServerRedirect) {
|
| +#if defined(OS_LINUX) // http://crbug.com/660288
|
| +#define MAYBE_ServerRedirect DISABLED_ServerRedirect
|
| +#else
|
| +#define MAYBE_ServerRedirect ServerRedirect
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, MAYBE_ServerRedirect) {
|
| ASSERT_TRUE(StartEmbeddedTestServer());
|
| ASSERT_TRUE(RunExtensionTest("webnavigation/serverRedirect"))
|
| << message_;
|
|
|