Get BrowserCloseManager browsertests to work with Network Service
The issue is that the tests were using URLRequestSlowDownloadJob,
which doesn't work with the Network Service because it uses
URLRequestInterceptor under the hood. This CL follows the pattern of
https://chromium-review.googlesource.com/c/chromium/src/+/745728 in
switching the tests to use SlowDownloadHttpResponse.
Bug: 776589
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_mojo
Change-Id: I538c12899dfa5f17b523bd46c83adf16e44c0218
Reviewed-on: https://chromium-review.googlesource.com/873375
Reviewed-by: John Abd-El-Malek <[email protected]>
Reviewed-by: Xing Liu <[email protected]>
Commit-Queue: Colin Blundell <[email protected]>
Cr-Commit-Position: refs/heads/master@{#530214}diff --git a/chrome/browser/lifetime/browser_close_manager_browsertest.cc b/chrome/browser/lifetime/browser_close_manager_browsertest.cc
index e98a45e..7a53077 100644
--- a/chrome/browser/lifetime/browser_close_manager_browsertest.cc
+++ b/chrome/browser/lifetime/browser_close_manager_browsertest.cc
@@ -54,10 +54,9 @@
#include "content/public/browser/web_contents.h"
#include "content/public/test/browser_test_utils.h"
#include "content/public/test/download_test_observer.h"
+#include "content/public/test/slow_download_http_response.h"
#include "content/public/test/test_navigation_observer.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
-#include "net/test/url_request/url_request_mock_http_job.h"
-#include "net/test/url_request/url_request_slow_download_job.h"
#if defined(OS_CHROMEOS)
#include "chromeos/chromeos_switches.h"
@@ -267,6 +266,9 @@
content::BrowserThread::PostTask(
content::BrowserThread::IO, FROM_HERE,
base::BindOnce(&chrome_browser_net::SetUrlRequestMocksEnabled, true));
+ embedded_test_server()->RegisterRequestHandler(base::BindRepeating(
+ &content::SlowDownloadHttpResponse::HandleSlowDownloadRequest));
+ ASSERT_TRUE(embedded_test_server()->Start());
}
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -279,11 +281,15 @@
}
void CreateStalledDownload(Browser* browser) {
+ ASSERT_TRUE(embedded_test_server()->Started());
+
+ GURL slow_download_url = embedded_test_server()->GetURL(
+ content::SlowDownloadHttpResponse::kKnownSizeUrl);
+
content::DownloadTestObserverInProgress observer(
content::BrowserContext::GetDownloadManager(browser->profile()), 1);
ui_test_utils::NavigateToURLWithDisposition(
- browser, GURL(net::URLRequestSlowDownloadJob::kKnownSizeUrl),
- WindowOpenDisposition::NEW_BACKGROUND_TAB,
+ browser, slow_download_url, WindowOpenDisposition::NEW_BACKGROUND_TAB,
ui_test_utils::BROWSER_TEST_NONE);
observer.WaitForFinished();
EXPECT_EQ(
@@ -304,7 +310,6 @@
};
IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, TestSingleTabShutdown) {
- ASSERT_TRUE(embedded_test_server()->Start());
ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(
browser(), embedded_test_server()->GetURL("/beforeunload.html")));
PrepareForDialog(browser());
@@ -328,7 +333,6 @@
IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,
TestShutdownMoreThanOnce) {
- ASSERT_TRUE(embedded_test_server()->Start());
ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(
browser(), embedded_test_server()->GetURL("/beforeunload.html")));
PrepareForDialog(browser());
@@ -354,7 +358,6 @@
IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,
PRE_TestSessionRestore) {
- ASSERT_TRUE(embedded_test_server()->Start());
ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(
browser(), embedded_test_server()->GetURL("/beforeunload.html")));
AddBlankTabAndShow(browser());
@@ -408,7 +411,6 @@
// Test that browser windows are only closed if all browsers are ready to close
// and that all beforeunload dialogs are shown again after a cancel.
IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, TestMultipleWindows) {
- ASSERT_TRUE(embedded_test_server()->Start());
browsers_.push_back(CreateBrowser(browser()->profile()));
ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(
browsers_[0], embedded_test_server()->GetURL("/beforeunload.html")));
@@ -458,7 +460,6 @@
// early.
IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,
TestHangInBeforeUnloadMultipleTabs) {
- ASSERT_TRUE(embedded_test_server()->Start());
ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(
browsers_[0], embedded_test_server()->GetURL("/beforeunload_hang.html")));
AddBlankTabAndShow(browsers_[0]);
@@ -494,7 +495,6 @@
// early.
IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,
TestHangInBeforeUnloadMultipleWindows) {
- ASSERT_TRUE(embedded_test_server()->Start());
browsers_.push_back(CreateBrowser(browser()->profile()));
browsers_.push_back(CreateBrowser(browser()->profile()));
ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(
@@ -532,7 +532,6 @@
// user chose to cancel browser close.
IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,
TestUnloadMultipleSlowTabs) {
- ASSERT_TRUE(embedded_test_server()->Start());
const int kTabCount = 5;
const int kResposiveTabIndex = 2;
// Create tab strip with all tabs except one responding after
@@ -579,7 +578,6 @@
// Regression for crbug.com/365052 caused CHECK in tabstrip.
IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,
TestBeforeUnloadMultipleSlowWindows) {
- ASSERT_TRUE(embedded_test_server()->Start());
const int kBrowserCount = 5;
const int kResposiveBrowserIndex = 2;
// Create multiple browsers with all tabs except one responding after
@@ -632,7 +630,6 @@
// Test that a window created during shutdown is closed.
IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,
MAYBE_TestAddWindowDuringShutdown) {
- ASSERT_TRUE(embedded_test_server()->Start());
ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(
browsers_[0], embedded_test_server()->GetURL("/beforeunload.html")));
PrepareForDialog(browsers_[0]);
@@ -651,7 +648,6 @@
// cancel the shutdown.
IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,
TestAddWindowWithBeforeUnloadDuringShutdown) {
- ASSERT_TRUE(embedded_test_server()->Start());
ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(
browsers_[0], embedded_test_server()->GetURL("/beforeunload.html")));
PrepareForDialog(browsers_[0]);
@@ -684,7 +680,6 @@
// Test that tabs added during shutdown are closed.
IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,
TestAddTabDuringShutdown) {
- ASSERT_TRUE(embedded_test_server()->Start());
browsers_.push_back(CreateBrowser(browser()->profile()));
ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(
browsers_[0], embedded_test_server()->GetURL("/beforeunload.html")));
@@ -710,7 +705,6 @@
IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,
TestAddTabWithBeforeUnloadDuringShutdown) {
- ASSERT_TRUE(embedded_test_server()->Start());
browsers_.push_back(CreateBrowser(browser()->profile()));
ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(
browsers_[0], embedded_test_server()->GetURL("/beforeunload.html")));
@@ -766,7 +760,6 @@
if (GetParam())
return;
- ASSERT_TRUE(embedded_test_server()->Start());
ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(
browser(), embedded_test_server()->GetURL("/title1.html")));
@@ -858,7 +851,6 @@
IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,
TestCloseTabDuringShutdown) {
- ASSERT_TRUE(embedded_test_server()->Start());
ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(
browsers_[0], embedded_test_server()->GetURL("/beforeunload.html")));
PrepareForDialog(browsers_[0]);
@@ -893,7 +885,6 @@
IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,
TestOpenAndCloseWindowDuringShutdown) {
- ASSERT_TRUE(embedded_test_server()->Start());
ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(
browsers_[0], embedded_test_server()->GetURL("/beforeunload.html")));
PrepareForDialog(browsers_[0]);
@@ -928,7 +919,6 @@
IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,
TestCloseWindowDuringShutdown) {
- ASSERT_TRUE(embedded_test_server()->Start());
ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(
browsers_[0], embedded_test_server()->GetURL("/beforeunload.html")));
browsers_.push_back(CreateBrowser(browser()->profile()));
@@ -994,7 +984,6 @@
#if defined(OS_MACOSX)
IN_PROC_BROWSER_TEST_P(BrowserCloseManagerWithDownloadsBrowserTest,
TestWithDownloads) {
- ASSERT_TRUE(embedded_test_server()->Start());
SetDownloadPathForProfile(browser()->profile());
ASSERT_NO_FATAL_FAILURE(CreateStalledDownload(browser()));
@@ -1017,7 +1006,6 @@
// Test shutdown with a DANGEROUS_URL download undecided.
IN_PROC_BROWSER_TEST_P(BrowserCloseManagerWithDownloadsBrowserTest,
TestWithDangerousUrlDownload) {
- ASSERT_TRUE(embedded_test_server()->Start());
SetDownloadPathForProfile(browser()->profile());
// Set up the fake delegate that forces the download to be malicious.
@@ -1059,7 +1047,6 @@
// Test shutdown with a download in progress.
IN_PROC_BROWSER_TEST_P(BrowserCloseManagerWithDownloadsBrowserTest,
TestWithDownloads) {
- ASSERT_TRUE(embedded_test_server()->Start());
SetDownloadPathForProfile(browser()->profile());
ASSERT_NO_FATAL_FAILURE(CreateStalledDownload(browser()));
content::TestNavigationObserver navigation_observer(
@@ -1088,7 +1075,6 @@
// Test shutdown with a download in progress in an off-the-record profile.
IN_PROC_BROWSER_TEST_P(BrowserCloseManagerWithDownloadsBrowserTest,
TestWithOffTheRecordDownloads) {
- ASSERT_TRUE(embedded_test_server()->Start());
Profile* otr_profile = browser()->profile()->GetOffTheRecordProfile();
SetDownloadPathForProfile(otr_profile);
Browser* otr_browser = CreateBrowser(otr_profile);
@@ -1187,7 +1173,6 @@
profile_manager->RegisterTestingProfile(other_profile, true, false);
Browser* other_profile_browser = CreateBrowser(other_profile);
- ASSERT_TRUE(embedded_test_server()->Start());
SetDownloadPathForProfile(browser()->profile());
SetDownloadPathForProfile(other_profile);
ASSERT_NO_FATAL_FAILURE(CreateStalledDownload(browser()));
@@ -1230,7 +1215,6 @@
// Test shutdown with downloads in progress and beforeunload handlers.
IN_PROC_BROWSER_TEST_P(BrowserCloseManagerWithDownloadsBrowserTest,
DISABLED_TestBeforeUnloadAndDownloads) {
- ASSERT_TRUE(embedded_test_server()->Start());
SetDownloadPathForProfile(browser()->profile());
ASSERT_NO_FATAL_FAILURE(CreateStalledDownload(browser()));
ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(
