Skip to content

Commit

Permalink
preload: Rename SetUp in PrerenderTestHelper
Browse files Browse the repository at this point in the history
Rename SetUp to RegisterServerRequestMonitor in PrerenderTestHelper
as it is possible to run on several servers and closer to the
behavior in the function.
source:
https://chromium-review.googlesource.com/c/chromium/src/+/4680342/30..39/chrome/browser/preloading/prerender/prerender_browsertest.cc#b66

Bug: 1462832
Change-Id: Ia4a20b2a25157733f2cb051679952d4ebd58d77e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4797355
Reviewed-by: Alex Ilin <alexilin@chromium.org>
Reviewed-by: Rakina Zata Amni <rakina@chromium.org>
Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Reviewed-by: Danil Somsikov <dsv@chromium.org>
Commit-Queue: Huanpo Lin <robertlin@chromium.org>
Reviewed-by: Hiroki Nakagawa <nhiroki@chromium.org>
Reviewed-by: Yao Xiao <yaoxia@chromium.org>
Reviewed-by: Patrick Monette <pmonette@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Code-Coverage: findit-for-me@appspot.gserviceaccount.com <findit-for-me@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#1187630}
  • Loading branch information
Robert Lin authored and Chromium LUCI CQ committed Aug 24, 2023
1 parent ffebf6d commit eb2a99c
Show file tree
Hide file tree
Showing 98 changed files with 106 additions and 102 deletions.
2 changes: 1 addition & 1 deletion chrome/browser/app_controller_mac_browsertest.mm
Original file line number Diff line number Diff line change
Expand Up @@ -1427,7 +1427,7 @@ void CloseTab(Browser* browser, int index) {
: public AppControllerHandoffBrowserTest {
public:
void SetUpOnMainThread() override {
prerender_helper_.SetUp(embedded_test_server());
prerender_helper_.RegisterServerRequestMonitor(embedded_test_server());
host_resolver()->AddRule("*", "127.0.0.1");
embedded_test_server()->ServeFilesFromDirectory(
base::PathService::CheckedGet(chrome::DIR_TEST_DATA));
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/autofill/autofill_browsertest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@ class AutofillTestPrerendering : public InProcessBrowserTest {
};

void SetUp() override {
prerender_helper_.SetUp(embedded_test_server());
prerender_helper_.RegisterServerRequestMonitor(embedded_test_server());
InProcessBrowserTest::SetUp();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class ContentAutofillDriverBrowserTest : public InProcessBrowserTest,
~ContentAutofillDriverBrowserTest() override = default;

void SetUp() override {
prerender_helper_.SetUp(embedded_test_server());
prerender_helper_.RegisterServerRequestMonitor(embedded_test_server());
InProcessBrowserTest::SetUp();
}

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/banners/app_banner_manager_browsertest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,7 @@ class AppBannerManagerPrerenderBrowserTest
const AppBannerManagerPrerenderBrowserTest&) = delete;

void SetUp() override {
prerender_helper_.SetUp(embedded_test_server());
prerender_helper_.RegisterServerRequestMonitor(embedded_test_server());
AppBannerManagerMPArchBrowserTest::SetUp();
}

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/bluetooth/web_bluetooth_browsertest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1362,7 +1362,7 @@ class WebBluetoothTestWithNewPermissionsBackendEnabledInPrerendering
default;

void SetUp() override {
prerender_helper_.SetUp(embedded_test_server());
prerender_helper_.RegisterServerRequestMonitor(embedded_test_server());
WebBluetoothTestWithNewPermissionsBackendEnabled::SetUp();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ class BrowsingTopicsBrowserTest : public BrowsingTopicsBrowserTestBase {
~BrowsingTopicsBrowserTest() override = default;

void SetUpOnMainThread() override {
prerender_helper_.SetUp(&https_server_);
prerender_helper_.RegisterServerRequestMonitor(&https_server_);

BrowsingTopicsBrowserTestBase::SetUpOnMainThread();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3060,7 +3060,7 @@ class CaptivePortalForPrerenderingTest : public CaptivePortalBrowserTest {
~CaptivePortalForPrerenderingTest() override = default;

void SetUp() override {
prerender_helper_.SetUp(embedded_test_server());
prerender_helper_.RegisterServerRequestMonitor(embedded_test_server());
CaptivePortalBrowserTest::SetUp();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1385,7 +1385,8 @@ class ContentSettingsWithPrerenderingBrowserTest : public ContentSettingsTest {
base::Unretained(this))) {}

void SetUp() override {
prerender_test_helper().SetUp(embedded_test_server());
prerender_test_helper().RegisterServerRequestMonitor(
embedded_test_server());
ContentSettingsTest::SetUp();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ class MixedContentSettingsTabHelperPrerenderBrowserTest
const MixedContentSettingsTabHelperPrerenderBrowserTest&) = delete;

void SetUp() override {
prerender_helper_.SetUp(test_server());
prerender_helper_.RegisterServerRequestMonitor(test_server());
MixedContentSettingsTabHelperBrowserTest::SetUp();
}

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/data_saver/data_saver_browsertest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ class DataSaverBrowserTest : public InProcessBrowserTest {
base::Unretained(this))) {}

void SetUp() override {
prerender_helper_.SetUp(embedded_test_server());
prerender_helper_.RegisterServerRequestMonitor(embedded_test_server());
InProcessBrowserTest::SetUp();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1128,7 +1128,7 @@ class PrerenderDataSaverProtocolTest : public DevToolsProtocolTest {

protected:
void SetUp() override {
prerender_helper_.SetUp(embedded_test_server());
prerender_helper_.RegisterServerRequestMonitor(embedded_test_server());
data_saver::OverrideIsDataSaverEnabledForTesting(true);
DevToolsProtocolTest::SetUp();
}
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/dips/dips_bounce_detector_browsertest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ class DIPSBounceDetectorBrowserTest : public PlatformBrowserTest {
}

void SetUpOnMainThread() override {
prerender_test_helper_.SetUp(embedded_test_server());
prerender_test_helper_.RegisterServerRequestMonitor(embedded_test_server());
ASSERT_TRUE(embedded_test_server()->Start());
host_resolver()->AddRule("a.test", "127.0.0.1");
host_resolver()->AddRule("b.test", "127.0.0.1");
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/dom_distiller/tab_utils_browsertest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ class DomDistillerTabUtilsPrerenderTest
base::Unretained(this))) {}

void SetUpOnMainThread() override {
prerender_helper_.SetUp(https_server_.get());
prerender_helper_.RegisterServerRequestMonitor(https_server_.get());
DomDistillerTabUtilsBrowserTest::SetUpOnMainThread();
}

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/download/download_browsertest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ class PrerenderDownloadTest : public MPArchDownloadTest {
~PrerenderDownloadTest() override = default;

void SetUp() override {
prerender_helper_.SetUp(embedded_test_server());
prerender_helper_.RegisterServerRequestMonitor(embedded_test_server());
MPArchDownloadTest::SetUp();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ class SetIconAPIPrerenderingTest : public SetIconAPITest {

private:
void SetUp() override {
prerender_helper_.SetUp(embedded_test_server());
prerender_helper_.RegisterServerRequestMonitor(embedded_test_server());
ExtensionApiTest::SetUp();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ class ContentFaviconDriverTest : public InProcessBrowserTest {
~ContentFaviconDriverTest() override = default;

void SetUp() override {
prerender_helper_.SetUp(embedded_test_server());
prerender_helper_.RegisterServerRequestMonitor(embedded_test_server());
InProcessBrowserTest::SetUp();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class ChromeFileSystemAccessPermissionContextPrerenderingBrowserTest
ASSERT_TRUE(
temp_dir_.CreateUniqueTempDirUnderPath(base::GetTempDirForTesting()));

prerender_test_helper_.SetUp(embedded_test_server());
prerender_test_helper_.RegisterServerRequestMonitor(embedded_test_server());
InProcessBrowserTest::SetUp();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class FileSystemAccessTabHelperPrerenderingBrowserTest
const FileSystemAccessTabHelperPrerenderingBrowserTest&) = delete;

void SetUp() override {
prerender_test_helper_.SetUp(embedded_test_server());
prerender_test_helper_.RegisterServerRequestMonitor(embedded_test_server());
InProcessBrowserTest::SetUp();
}

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/geolocation/geolocation_browsertest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ class GeolocationPrerenderBrowserTest : public GeolocationBrowserTest {
~GeolocationPrerenderBrowserTest() override = default;

void SetUp() override {
prerender_helper_.SetUp(embedded_test_server());
prerender_helper_.RegisterServerRequestMonitor(embedded_test_server());
GeolocationBrowserTest::SetUp();
}

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/history/history_browsertest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1002,7 +1002,7 @@ class HistoryPrerenderBrowserTest : public HistoryMPArchBrowserTest {
base::Unretained(this))) {}

void SetUp() override {
prerender_helper_.SetUp(embedded_test_server());
prerender_helper_.RegisterServerRequestMonitor(embedded_test_server());
HistoryMPArchBrowserTest::SetUp();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ class LoginDetectionPrerenderBrowserTest : public LoginDetectionBrowserTest {
const LoginDetectionPrerenderBrowserTest&) = delete;

void SetUp() override {
prerender_helper_->SetUp(embedded_test_server());
prerender_helper_->RegisterServerRequestMonitor(embedded_test_server());
LoginDetectionBrowserTest::SetUp();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1856,7 +1856,7 @@ class LookalikeUrlNavigationThrottlePrerenderBrowserTest
}

void SetUpOnMainThread() override {
prerender_helper_->SetUp(https_server());
prerender_helper_->RegisterServerRequestMonitor(https_server());
LookalikeUrlNavigationThrottleBrowserTest::SetUpOnMainThread();
}

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/media/history/media_history_browsertest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1189,7 +1189,7 @@ class MediaHistoryForPrerenderBrowserTest : public MediaHistoryBrowserTest {
}

void SetUp() override {
prerender_helper_.SetUp(embedded_test_server());
prerender_helper_.RegisterServerRequestMonitor(embedded_test_server());
MediaHistoryBrowserTest::SetUp();
}

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/media/media_engagement_browsertest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -950,7 +950,7 @@ class MediaEngagementContentsObserverPrerenderBrowserTest
~MediaEngagementContentsObserverPrerenderBrowserTest() override = default;

void SetUpOnMainThread() override {
prerender_helper_->SetUp(embedded_test_server());
prerender_helper_->RegisterServerRequestMonitor(embedded_test_server());
MediaEngagementContentsObserverMPArchBrowserTest::SetUpOnMainThread();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ class MAYBE_OutOfMemoryReporterPrerenderBrowserTest
base::Unretained(this))) {}

void SetUp() override {
prerender_helper_.SetUp(embedded_test_server());
prerender_helper_.RegisterServerRequestMonitor(embedded_test_server());
MAYBE_OutOfMemoryReporterBrowserTest::SetUp();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ class TabStatsTrackerPrerenderBrowserTest : public TabStatsTrackerBrowserTest {
const TabStatsTrackerPrerenderBrowserTest&) = delete;

void SetUp() override {
prerender_helper_.SetUp(embedded_test_server());
prerender_helper_.RegisterServerRequestMonitor(embedded_test_server());
TabStatsTrackerBrowserTest::SetUp();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,7 @@ class NavigationPredictorPrerenderBrowserTest
const NavigationPredictorPrerenderBrowserTest&) = delete;

void SetUp() override {
prerender_test_helper_.SetUp(test_server());
prerender_test_helper_.RegisterServerRequestMonitor(test_server());
NavigationPredictorMPArchBrowserTest::SetUp();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ class NavigationPredictorPreconnectClientPrerenderBrowserTestNoDelay
delete;

void SetUp() override {
prerender_test_helper_.SetUp(https_server_.get());
prerender_test_helper_.RegisterServerRequestMonitor(https_server_.get());
NavigationPredictorPreconnectClientBrowserTestPreconnectOnDidFinishNavigationNoDelay::
SetUp();
}
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/net/net_error_tab_helper_browsertest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class NetErrorTabHelperWithPrerenderingTest : public NetErrorTabHelperTest {
const NetErrorTabHelperWithPrerenderingTest&) = delete;

void SetUp() override {
prerender_helper_.SetUp(embedded_test_server());
prerender_helper_.RegisterServerRequestMonitor(embedded_test_server());
NetErrorTabHelperTest::SetUp();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class AmpPageLoadMetricsBrowserTest : public InProcessBrowserTest,
~AmpPageLoadMetricsBrowserTest() override {}

void SetUp() override {
prerender_helper_.SetUp(embedded_test_server());
prerender_helper_.RegisterServerRequestMonitor(embedded_test_server());
InProcessBrowserTest::SetUp();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class ForegroundDurationUKMObserverBrowserTest : public InProcessBrowserTest {
}

void SetUp() override {
prerender_helper_.SetUp(embedded_test_server());
prerender_helper_.RegisterServerRequestMonitor(embedded_test_server());
InProcessBrowserTest::SetUp();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ class PrefetchPageLoadMetricsObserverPrerenderBrowserTest
const PrefetchPageLoadMetricsObserverPrerenderBrowserTest&) = delete;

void SetUp() override {
prerender_helper_.SetUp(embedded_test_server());
prerender_helper_.RegisterServerRequestMonitor(embedded_test_server());
PrefetchPageLoadMetricsObserverBrowserTest::SetUp();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class PrerenderPageLoadMetricsObserverBrowserTest
~PrerenderPageLoadMetricsObserverBrowserTest() override = default;

void SetUp() override {
prerender_helper_.SetUp(embedded_test_server());
prerender_helper_.RegisterServerRequestMonitor(embedded_test_server());
MetricIntegrationTest::SetUp();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ class SecurityStatePageLoadMetricsPrerenderBrowserTest
~SecurityStatePageLoadMetricsPrerenderBrowserTest() override = default;

void SetUp() override {
prerender_helper_.SetUp(embedded_test_server());
prerender_helper_.RegisterServerRequestMonitor(embedded_test_server());
SecurityStatePageLoadMetricsBrowserTest::SetUp();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3975,7 +3975,7 @@ class PrerenderPageLoadMetricsBrowserTest : public PageLoadMetricsBrowserTest {
base::Unretained(this))) {}

void SetUp() override {
prerender_helper_.SetUp(embedded_test_server());
prerender_helper_.RegisterServerRequestMonitor(embedded_test_server());
PageLoadMetricsBrowserTest::SetUp();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1027,7 +1027,7 @@ class CredentialManagerPrerenderBrowserTest
~CredentialManagerPrerenderBrowserTest() override = default;

void SetUp() override {
prerender_helper_.SetUp(embedded_test_server());
prerender_helper_.RegisterServerRequestMonitor(embedded_test_server());
CredentialManagerBrowserTest::SetUp();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ class PasswordGenerationPopupViewPrerenderingTest
~PasswordGenerationPopupViewPrerenderingTest() override = default;

void SetUp() override {
prerender_helper_.SetUp(embedded_test_server());
prerender_helper_.RegisterServerRequestMonitor(embedded_test_server());
PasswordGenerationInteractiveTest::SetUp();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4415,7 +4415,7 @@ class PasswordManagerPrerenderBrowserTest : public PasswordManagerBrowserTest {
~PasswordManagerPrerenderBrowserTest() override = default;

void SetUp() override {
prerender_helper_.SetUp(embedded_test_server());
prerender_helper_.RegisterServerRequestMonitor(embedded_test_server());
PasswordManagerBrowserTest::SetUp();
}

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/pdf/pdf_extension_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2785,7 +2785,7 @@ class PDFExtensionPrerenderTest : public PDFExtensionTest {
}

void SetUpOnMainThread() override {
prerender_helper_->SetUp(embedded_test_server());
prerender_helper_->RegisterServerRequestMonitor(embedded_test_server());
PDFExtensionTest::SetUpOnMainThread();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class PageLoadMetricsObserverPrerenderBrowserTest
const PageLoadMetricsObserverPrerenderBrowserTest&) = delete;

void SetUp() override {
prerender_helper_.SetUp(embedded_test_server());
prerender_helper_.RegisterServerRequestMonitor(embedded_test_server());
PageLoadMetricsObserverBrowserTest::SetUp();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ class PermissionRequestManagerWithPrerenderingTest
base::Unretained(this))) {}

void SetUp() override {
prerender_test_helper_.SetUp(embedded_test_server());
prerender_test_helper_.RegisterServerRequestMonitor(embedded_test_server());
PermissionRequestManagerBrowserTest::SetUp();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1623,7 +1623,7 @@ class PermissionRequestWithPrerendererTest
const PermissionRequestWithPrerendererTest&) = delete;

void SetUp() override {
prerender_helper_.SetUp(embedded_test_server());
prerender_helper_.RegisterServerRequestMonitor(embedded_test_server());
PermissionsSecurityModelInteractiveUITest::SetUp();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class PDFIFrameNavigationThrottleBrowserTest : public InProcessBrowserTest {
}

void SetUp() override {
prerender_helper_.SetUp(embedded_test_server());
prerender_helper_.RegisterServerRequestMonitor(embedded_test_server());
InProcessBrowserTest::SetUp();
}

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/predictors/loading_predictor_browsertest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2296,7 +2296,7 @@ class MultiPageBrowserTest : public InProcessBrowserTest {

protected:
void SetUp() override {
prerender_test_helper_.SetUp(embedded_test_server());
prerender_test_helper_.RegisterServerRequestMonitor(embedded_test_server());
InProcessBrowserTest::SetUp();
}
void SetUpOnMainThread() override {
Expand Down

0 comments on commit eb2a99c

Please sign in to comment.