Commit 6329dc2c authored by John Abd-El-Malek's avatar John Abd-El-Malek Committed by Commit Bot

Skip ThrottlesAddedExactlyOnceTo*Downloads tests with the network service.

These tests don't apply to the network service code path because
1) ResourceThrottles aren't used
2) Downloads go through a different path (interception of the URLLoader in NavigationRequest) that make the bug for these tests not possible

Bug: 787614
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_mojo
Change-Id: Ia3d620540801d26344fb8453228e911a2c629c10
Reviewed-on: https://chromium-review.googlesource.com/1028364Reviewed-by: default avatarMatt Menke <mmenke@chromium.org>
Commit-Queue: John Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553636}
parent deeb65a0
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
#include "net/test/url_request/url_request_mock_http_job.h" #include "net/test/url_request/url_request_mock_http_job.h"
#include "net/url_request/url_request.h" #include "net/url_request/url_request.h"
#include "net/url_request/url_request_filter.h" #include "net/url_request/url_request_filter.h"
#include "services/network/public/cpp/features.h"
#include "testing/gmock/include/gmock/gmock-matchers.h" #include "testing/gmock/include/gmock/gmock-matchers.h"
using content::ResourceType; using content::ResourceType;
...@@ -590,6 +591,10 @@ IN_PROC_BROWSER_TEST_F(ChromeResourceDispatcherHostDelegateBrowserTest, ...@@ -590,6 +591,10 @@ IN_PROC_BROWSER_TEST_F(ChromeResourceDispatcherHostDelegateBrowserTest,
// See https://crbug.com/640545 // See https://crbug.com/640545
IN_PROC_BROWSER_TEST_F(ChromeResourceDispatcherHostDelegateBrowserTest, IN_PROC_BROWSER_TEST_F(ChromeResourceDispatcherHostDelegateBrowserTest,
ThrottlesAddedExactlyOnceToTinySniffedDownloads) { ThrottlesAddedExactlyOnceToTinySniffedDownloads) {
// This code path isn't used when the network service is enabled.
if (base::FeatureList::IsEnabled(network::features::kNetworkService))
return;
GURL url = embedded_test_server()->GetURL("/downloads/tiny_binary.bin"); GURL url = embedded_test_server()->GetURL("/downloads/tiny_binary.bin");
DownloadTestObserverNotInProgress download_observer( DownloadTestObserverNotInProgress download_observer(
content::BrowserContext::GetDownloadManager(browser()->profile()), 1); content::BrowserContext::GetDownloadManager(browser()->profile()), 1);
...@@ -603,6 +608,10 @@ IN_PROC_BROWSER_TEST_F(ChromeResourceDispatcherHostDelegateBrowserTest, ...@@ -603,6 +608,10 @@ IN_PROC_BROWSER_TEST_F(ChromeResourceDispatcherHostDelegateBrowserTest,
// have their mime type determined before the end of the response is reported. // have their mime type determined before the end of the response is reported.
IN_PROC_BROWSER_TEST_F(ChromeResourceDispatcherHostDelegateBrowserTest, IN_PROC_BROWSER_TEST_F(ChromeResourceDispatcherHostDelegateBrowserTest,
ThrottlesAddedExactlyOnceToLargeSniffedDownloads) { ThrottlesAddedExactlyOnceToLargeSniffedDownloads) {
// This code path isn't used when the network service is enabled.
if (base::FeatureList::IsEnabled(network::features::kNetworkService))
return;
GURL url = embedded_test_server()->GetURL("/downloads/thisdayinhistory.xls"); GURL url = embedded_test_server()->GetURL("/downloads/thisdayinhistory.xls");
DownloadTestObserverNotInProgress download_observer( DownloadTestObserverNotInProgress download_observer(
content::BrowserContext::GetDownloadManager(browser()->profile()), 1); content::BrowserContext::GetDownloadManager(browser()->profile()), 1);
...@@ -616,6 +625,10 @@ IN_PROC_BROWSER_TEST_F(ChromeResourceDispatcherHostDelegateBrowserTest, ...@@ -616,6 +625,10 @@ IN_PROC_BROWSER_TEST_F(ChromeResourceDispatcherHostDelegateBrowserTest,
// <a download> click. // <a download> click.
IN_PROC_BROWSER_TEST_F(ChromeResourceDispatcherHostDelegateBrowserTest, IN_PROC_BROWSER_TEST_F(ChromeResourceDispatcherHostDelegateBrowserTest,
ThrottlesAddedExactlyOnceToADownloads) { ThrottlesAddedExactlyOnceToADownloads) {
// This code path isn't used when the network service is enabled.
if (base::FeatureList::IsEnabled(network::features::kNetworkService))
return;
DownloadTestObserverNotInProgress download_observer( DownloadTestObserverNotInProgress download_observer(
content::BrowserContext::GetDownloadManager(browser()->profile()), 1); content::BrowserContext::GetDownloadManager(browser()->profile()), 1);
download_observer.StartObserving(); download_observer.StartObserving();
......
...@@ -246,11 +246,6 @@ ...@@ -246,11 +246,6 @@
-ChromeResourceDispatcherHostDelegateBrowserTest.PolicyHeader -ChromeResourceDispatcherHostDelegateBrowserTest.PolicyHeader
-ChromeResourceDispatcherHostDelegateBrowserTest.PolicyHeaderForRedirect -ChromeResourceDispatcherHostDelegateBrowserTest.PolicyHeaderForRedirect
# http://crbug.com/787614
-ChromeResourceDispatcherHostDelegateBrowserTest.ThrottlesAddedExactlyOnceToADownloads
-ChromeResourceDispatcherHostDelegateBrowserTest.ThrottlesAddedExactlyOnceToLargeSniffedDownloads
-ChromeResourceDispatcherHostDelegateBrowserTest.ThrottlesAddedExactlyOnceToTinySniffedDownloads
# Add support of download_to_file for URLLoader. # Add support of download_to_file for URLLoader.
# http://crbug.com/791702 # http://crbug.com/791702
-OutOfProcessPPAPITest.FileRef1 -OutOfProcessPPAPITest.FileRef1
......
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