Commit d61d2be2 authored by Arthur Sonzogni's avatar Arthur Sonzogni Committed by Commit Bot

Re-enable ChromeNavigationBrowserTest.BlockLegacySubresources on Mac.

Bug: 816646
Change-Id: I76f84ba670a69a7e599d43b3dcd0eddde43578fa
Reviewed-on: https://chromium-review.googlesource.com/1082397Reviewed-by: default avatarCamille Lamy <clamy@chromium.org>
Commit-Queue: Arthur Sonzogni <arthursonzogni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#564830}
parent 0b270692
...@@ -938,13 +938,7 @@ class WillProcessResponseObserver : public content::WebContentsObserver { ...@@ -938,13 +938,7 @@ class WillProcessResponseObserver : public content::WebContentsObserver {
// not handler defined for the "ftp" protocol in // not handler defined for the "ftp" protocol in
// URLRequestJobFactoryImpl::protocol_handler_map_. // URLRequestJobFactoryImpl::protocol_handler_map_.
// Flaky on Mac only. http://crbug.com/816646 // Flaky on Mac only. http://crbug.com/816646
#if defined(OS_MACOSX) IN_PROC_BROWSER_TEST_F(ChromeNavigationBrowserTest, BlockLegacySubresources) {
#define MAYBE_BlockLegacySubresources DISABLED_BlockLegacySubresources
#else
#define MAYBE_BlockLegacySubresources BlockLegacySubresources
#endif
IN_PROC_BROWSER_TEST_F(ChromeNavigationBrowserTest,
MAYBE_BlockLegacySubresources) {
net::SpawnedTestServer ftp_server( net::SpawnedTestServer ftp_server(
net::SpawnedTestServer::TYPE_FTP, net::SpawnedTestServer::TYPE_FTP,
base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); base::FilePath(FILE_PATH_LITERAL("chrome/test/data")));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment