Skip to content

GitLab

T
tangled
Commit 9aeb39b9 authored by Kenichi Ishibashi's avatar Kenichi Ishibashi Committed by Commit Bot
Browse files
Options

Revert "service worker: Run some browser_tests with disabling OTMT fetch" 

This reverts commit 7bfff78e.
We are going to remove legacy on-the-main-thread script fetch soon.

Bug: 967272
Change-Id: Ic191ce2a77deb153c7b4c6f1a90fb8cbd2ce8c4f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1730652Reviewed-by: default avatarHiroki Nakagawa <nhiroki@chromium.org>
Commit-Queue: Kenichi Ishibashi <bashi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#683062}
parent b5378a8c
Show whitespace changes
Inline Side-by-side
Showing with 74 additions and 157 deletions
content/browser/service_worker/service_worker_browsertest.cc
View file @ 9aeb39b9
...@@ -459,19 +459,10 @@ const char kNavigationPreloadNetworkError[] = ...@@ -459,19 +459,10 @@ const char kNavigationPreloadNetworkError[] =
} // namespace } // namespace
class ServiceWorkerBrowserTest : public ContentBrowserTest, class ServiceWorkerBrowserTest : public ContentBrowserTest {
public testing::WithParamInterface<bool> {
protected: protected:
using self = ServiceWorkerBrowserTest; using self = ServiceWorkerBrowserTest;
void SetUp() override {
if (ShouldDisableOffMainScriptFetch()) {
feature_list_.InitAndDisableFeature(
blink::features::kOffMainThreadServiceWorkerScriptFetch);
}
ContentBrowserTest::SetUp();
}
void SetUpOnMainThread() override { void SetUpOnMainThread() override {
ASSERT_TRUE(embedded_test_server()->InitializeAndListen()); ASSERT_TRUE(embedded_test_server()->InitializeAndListen());
StoragePartition* partition = BrowserContext::GetDefaultStoragePartition( StoragePartition* partition = BrowserContext::GetDefaultStoragePartition(
...@@ -509,11 +500,7 @@ class ServiceWorkerBrowserTest : public ContentBrowserTest, ...@@ -509,11 +500,7 @@ class ServiceWorkerBrowserTest : public ContentBrowserTest,
ServiceWorkerContextWrapper* wrapper() { return wrapper_.get(); } ServiceWorkerContextWrapper* wrapper() { return wrapper_.get(); }
ServiceWorkerContext* public_context() { return wrapper(); } ServiceWorkerContext* public_context() { return wrapper(); }
base::test::ScopedFeatureList feature_list_;
private: private:
bool ShouldDisableOffMainScriptFetch() { return GetParam(); }
scoped_refptr<ServiceWorkerContextWrapper> wrapper_; scoped_refptr<ServiceWorkerContextWrapper> wrapper_;
}; };
...@@ -1069,7 +1056,7 @@ class ServiceWorkerVersionBrowserTest : public ServiceWorkerBrowserTest { ...@@ -1069,7 +1056,7 @@ class ServiceWorkerVersionBrowserTest : public ServiceWorkerBrowserTest {
std::vector<ServiceWorkerRemoteProviderEndpoint> remote_endpoints_; std::vector<ServiceWorkerRemoteProviderEndpoint> remote_endpoints_;
}; };
IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, StartAndStop) { IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, StartAndStop) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
RunOnIOThread(base::BindOnce(&self::SetUpRegistrationOnIOThread, RunOnIOThread(base::BindOnce(&self::SetUpRegistrationOnIOThread,
base::Unretained(this), base::Unretained(this),
...@@ -1096,7 +1083,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, StartAndStop) { ...@@ -1096,7 +1083,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, StartAndStop) {
// TODO(lunalu): remove this test when blink side use counter is removed // TODO(lunalu): remove this test when blink side use counter is removed
// (crbug.com/811948). // (crbug.com/811948).
IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
DropCountsOnBlinkUseCounter) { DropCountsOnBlinkUseCounter) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
RunOnIOThread(base::BindOnce(&self::SetUpRegistrationOnIOThread, RunOnIOThread(base::BindOnce(&self::SetUpRegistrationOnIOThread,
...@@ -1128,7 +1115,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, ...@@ -1128,7 +1115,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest,
"Blink.UseCounter.Features")); "Blink.UseCounter.Features"));
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, StartNotFound) { IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, StartNotFound) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
RunOnIOThread(base::BindOnce(&self::SetUpRegistrationOnIOThread, RunOnIOThread(base::BindOnce(&self::SetUpRegistrationOnIOThread,
base::Unretained(this), base::Unretained(this),
...@@ -1138,7 +1125,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, StartNotFound) { ...@@ -1138,7 +1125,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, StartNotFound) {
StartWorker(blink::ServiceWorkerStatusCode::kErrorNetwork); StartWorker(blink::ServiceWorkerStatusCode::kErrorNetwork);
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, ReadResourceFailure) { IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, ReadResourceFailure) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
// Create a registration with an active version. // Create a registration with an active version.
...@@ -1171,7 +1158,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, ReadResourceFailure) { ...@@ -1171,7 +1158,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, ReadResourceFailure) {
EXPECT_TRUE(registration_->is_uninstalled()); EXPECT_TRUE(registration_->is_uninstalled());
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
ReadResourceFailure_WaitingWorker) { ReadResourceFailure_WaitingWorker) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
// Create a registration and active version. // Create a registration and active version.
...@@ -1217,20 +1204,20 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, ...@@ -1217,20 +1204,20 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest,
EXPECT_TRUE(registration_->is_uninstalled()); EXPECT_TRUE(registration_->is_uninstalled());
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, Install) { IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, Install) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
InstallTestHelper("/service_worker/worker.js", InstallTestHelper("/service_worker/worker.js",
blink::ServiceWorkerStatusCode::kOk); blink::ServiceWorkerStatusCode::kOk);
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
InstallWithWaitUntil_Fulfilled) { InstallWithWaitUntil_Fulfilled) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
InstallTestHelper("/service_worker/worker_install_fulfilled.js", InstallTestHelper("/service_worker/worker_install_fulfilled.js",
blink::ServiceWorkerStatusCode::kOk); blink::ServiceWorkerStatusCode::kOk);
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
InstallWithFetchHandler) { InstallWithFetchHandler) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
InstallTestHelper("/service_worker/fetch_event.js", InstallTestHelper("/service_worker/fetch_event.js",
...@@ -1239,7 +1226,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, ...@@ -1239,7 +1226,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest,
version_->fetch_handler_existence()); version_->fetch_handler_existence());
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
InstallWithoutFetchHandler) { InstallWithoutFetchHandler) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
InstallTestHelper("/service_worker/worker.js", InstallTestHelper("/service_worker/worker.js",
...@@ -1250,7 +1237,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, ...@@ -1250,7 +1237,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest,
// Check that ServiceWorker script requests set a "Service-Worker: script" // Check that ServiceWorker script requests set a "Service-Worker: script"
// header. // header.
IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
ServiceWorkerScriptHeader) { ServiceWorkerScriptHeader) {
embedded_test_server()->RegisterRequestHandler( embedded_test_server()->RegisterRequestHandler(
base::BindRepeating(&VerifyServiceWorkerHeaderInRequest)); base::BindRepeating(&VerifyServiceWorkerHeaderInRequest));
...@@ -1259,7 +1246,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, ...@@ -1259,7 +1246,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest,
blink::ServiceWorkerStatusCode::kOk); blink::ServiceWorkerStatusCode::kOk);
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
Activate_NoEventListener) { Activate_NoEventListener) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
InstallTestHelper("/service_worker/worker.js", InstallTestHelper("/service_worker/worker.js",
...@@ -1268,7 +1255,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, ...@@ -1268,7 +1255,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest,
ASSERT_EQ(ServiceWorkerVersion::ACTIVATING, version_->status()); ASSERT_EQ(ServiceWorkerVersion::ACTIVATING, version_->status());
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, Activate_Rejected) { IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, Activate_Rejected) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
InstallTestHelper("/service_worker/worker_activate_rejected.js", InstallTestHelper("/service_worker/worker_activate_rejected.js",
blink::ServiceWorkerStatusCode::kOk); blink::ServiceWorkerStatusCode::kOk);
...@@ -1276,7 +1263,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, Activate_Rejected) { ...@@ -1276,7 +1263,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, Activate_Rejected) {
blink::ServiceWorkerStatusCode::kErrorEventWaitUntilRejected); blink::ServiceWorkerStatusCode::kErrorEventWaitUntilRejected);
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
InstallWithWaitUntil_Rejected) { InstallWithWaitUntil_Rejected) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
InstallTestHelper( InstallTestHelper(
...@@ -1284,7 +1271,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, ...@@ -1284,7 +1271,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest,
blink::ServiceWorkerStatusCode::kErrorEventWaitUntilRejected); blink::ServiceWorkerStatusCode::kErrorEventWaitUntilRejected);
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
InstallWithWaitUntil_RejectConsoleMessage) { InstallWithWaitUntil_RejectConsoleMessage) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
RunOnIOThread(base::BindOnce(&self::SetUpRegistrationOnIOThread, RunOnIOThread(base::BindOnce(&self::SetUpRegistrationOnIOThread,
...@@ -1318,7 +1305,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, ...@@ -1318,7 +1305,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest,
} }
// Tests starting an installed classic service worker while offline. // Tests starting an installed classic service worker while offline.
IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
StartInstalledClassicScriptWhileOffline) { StartInstalledClassicScriptWhileOffline) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
...@@ -1337,7 +1324,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, ...@@ -1337,7 +1324,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest,
} }
// Tests starting an installed module service worker while offline. // Tests starting an installed module service worker while offline.
IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
StartInstalledModuleScriptWhileOffline) { StartInstalledModuleScriptWhileOffline) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
...@@ -1369,7 +1356,7 @@ class WaitForLoaded : public EmbeddedWorkerInstance::Listener { ...@@ -1369,7 +1356,7 @@ class WaitForLoaded : public EmbeddedWorkerInstance::Listener {
base::OnceClosure quit_; base::OnceClosure quit_;
}; };
IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, TimeoutStartingWorker) { IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, TimeoutStartingWorker) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
RunOnIOThread(base::BindOnce(&self::SetUpRegistrationOnIOThread, RunOnIOThread(base::BindOnce(&self::SetUpRegistrationOnIOThread,
base::Unretained(this), base::Unretained(this),
...@@ -1406,7 +1393,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, TimeoutStartingWorker) { ...@@ -1406,7 +1393,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, TimeoutStartingWorker) {
EXPECT_EQ(blink::ServiceWorkerStatusCode::kErrorTimeout, status.value()); EXPECT_EQ(blink::ServiceWorkerStatusCode::kErrorTimeout, status.value());
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, TimeoutWorkerInEvent) { IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, TimeoutWorkerInEvent) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
RunOnIOThread( RunOnIOThread(
base::BindOnce(&self::SetUpRegistrationOnIOThread, base::Unretained(this), base::BindOnce(&self::SetUpRegistrationOnIOThread, base::Unretained(this),
...@@ -1442,7 +1429,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, TimeoutWorkerInEvent) { ...@@ -1442,7 +1429,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, TimeoutWorkerInEvent) {
status.value()); status.value());
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, FetchEvent_Response) { IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, FetchEvent_Response) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
ServiceWorkerFetchDispatcher::FetchEventResult result; ServiceWorkerFetchDispatcher::FetchEventResult result;
blink::mojom::FetchAPIResponsePtr response; blink::mojom::FetchAPIResponsePtr response;
...@@ -1473,7 +1460,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, FetchEvent_Response) { ...@@ -1473,7 +1460,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, FetchEvent_Response) {
} }
// Tests for response type when a service worker does respondWith(fetch()). // Tests for response type when a service worker does respondWith(fetch()).
IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
FetchEvent_ResponseNetwork) { FetchEvent_ResponseNetwork) {
const char* kPath = "/service_worker/http_cache.html"; const char* kPath = "/service_worker/http_cache.html";
...@@ -1505,7 +1492,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, ...@@ -1505,7 +1492,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest,
response2->response_source); response2->response_source);
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
FetchEvent_ResponseViaCache) { FetchEvent_ResponseViaCache) {
const char* kPath = "/service_worker/empty.html"; const char* kPath = "/service_worker/empty.html";
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
...@@ -1537,7 +1524,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, ...@@ -1537,7 +1524,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest,
response2->response_source); response2->response_source);
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
FetchEvent_respondWithRejection) { FetchEvent_respondWithRejection) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
ServiceWorkerFetchDispatcher::FetchEventResult result; ServiceWorkerFetchDispatcher::FetchEventResult result;
...@@ -1580,7 +1567,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, ...@@ -1580,7 +1567,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest,
// clock being reasonable during the test. So it might break on daylight savings // clock being reasonable during the test. So it might break on daylight savings
// leap or something: // leap or something:
// https://groups.google.com/a/chromium.org/d/msg/chromium-dev/C3EvKPrb0XM/4Jv02SpNYncJ // https://groups.google.com/a/chromium.org/d/msg/chromium-dev/C3EvKPrb0XM/4Jv02SpNYncJ
IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
UpdateBypassesCacheAfter24Hours) { UpdateBypassesCacheAfter24Hours) {
const char kScope[] = "/service_worker/handle_fetch.html"; const char kScope[] = "/service_worker/handle_fetch.html";
const char kWorkerUrl[] = "/service_worker/update_worker.js"; const char kWorkerUrl[] = "/service_worker/update_worker.js";
...@@ -1680,7 +1667,7 @@ class MockContentBrowserClient : public TestContentBrowserClient { ...@@ -1680,7 +1667,7 @@ class MockContentBrowserClient : public TestContentBrowserClient {
bool data_saver_enabled_; bool data_saver_enabled_;
}; };
IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, FetchWithSaveData) { IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, FetchWithSaveData) {
embedded_test_server()->RegisterRequestHandler( embedded_test_server()->RegisterRequestHandler(
base::BindRepeating(&VerifySaveDataHeaderInRequest)); base::BindRepeating(&VerifySaveDataHeaderInRequest));
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
...@@ -1694,7 +1681,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, FetchWithSaveData) { ...@@ -1694,7 +1681,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, FetchWithSaveData) {
SetBrowserClientForTesting(old_client); SetBrowserClientForTesting(old_client);
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
RequestWorkerScriptWithSaveData) { RequestWorkerScriptWithSaveData) {
embedded_test_server()->RegisterRequestHandler( embedded_test_server()->RegisterRequestHandler(
base::BindRepeating(&VerifySaveDataHeaderInRequest)); base::BindRepeating(&VerifySaveDataHeaderInRequest));
...@@ -1709,7 +1696,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, ...@@ -1709,7 +1696,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest,
SetBrowserClientForTesting(old_client); SetBrowserClientForTesting(old_client);
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, FetchWithoutSaveData) { IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, FetchWithoutSaveData) {
embedded_test_server()->RegisterRequestHandler( embedded_test_server()->RegisterRequestHandler(
base::BindRepeating(&VerifySaveDataHeaderNotInRequest)); base::BindRepeating(&VerifySaveDataHeaderNotInRequest));
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
...@@ -1724,7 +1711,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, FetchWithoutSaveData) { ...@@ -1724,7 +1711,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, FetchWithoutSaveData) {
// Tests the |top_frame_origin| and |request_initiator| on the main resource and // Tests the |top_frame_origin| and |request_initiator| on the main resource and
// subresource requests from service workers, in order to ensure proper handling // subresource requests from service workers, in order to ensure proper handling
// by the SplitCache. See https://crbug.com/918868. // by the SplitCache. See https://crbug.com/918868.
IN_PROC_BROWSER_TEST_P(ServiceWorkerBrowserTest, RequestOrigin) { IN_PROC_BROWSER_TEST_F(ServiceWorkerBrowserTest, RequestOrigin) {
embedded_test_server()->StartAcceptingConnections(); embedded_test_server()->StartAcceptingConnections();
// To make things tricky about |top_frame_origin|, this test navigates to a // To make things tricky about |top_frame_origin|, this test navigates to a
...@@ -1779,7 +1766,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerBrowserTest, RequestOrigin) { ...@@ -1779,7 +1766,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerBrowserTest, RequestOrigin) {
request_origin_expectation_waiter.Run(); request_origin_expectation_waiter.Run();
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerBrowserTest, FetchPageWithSaveData) { IN_PROC_BROWSER_TEST_F(ServiceWorkerBrowserTest, FetchPageWithSaveData) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
const char kPageUrl[] = "/service_worker/handle_fetch.html"; const char kPageUrl[] = "/service_worker/handle_fetch.html";
const char kWorkerUrl[] = "/service_worker/add_save_data_to_title.js"; const char kWorkerUrl[] = "/service_worker/add_save_data_to_title.js";
...@@ -1818,7 +1805,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerBrowserTest, FetchPageWithSaveData) { ...@@ -1818,7 +1805,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerBrowserTest, FetchPageWithSaveData) {
// Tests that when data saver is enabled and a cross-origin fetch by a webpage // Tests that when data saver is enabled and a cross-origin fetch by a webpage
// is intercepted by a serviceworker, and the serviceworker does a fetch, the // is intercepted by a serviceworker, and the serviceworker does a fetch, the
// preflight request does not have save-data in Access-Control-Request-Headers. // preflight request does not have save-data in Access-Control-Request-Headers.
IN_PROC_BROWSER_TEST_P(ServiceWorkerBrowserTest, CrossOriginFetchWithSaveData) { IN_PROC_BROWSER_TEST_F(ServiceWorkerBrowserTest, CrossOriginFetchWithSaveData) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
const char kPageUrl[] = "/service_worker/fetch_cross_origin.html"; const char kPageUrl[] = "/service_worker/fetch_cross_origin.html";
const char kWorkerUrl[] = "/service_worker/fetch_event_pass_through.js"; const char kWorkerUrl[] = "/service_worker/fetch_event_pass_through.js";
...@@ -1865,7 +1852,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerBrowserTest, CrossOriginFetchWithSaveData) { ...@@ -1865,7 +1852,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerBrowserTest, CrossOriginFetchWithSaveData) {
run_loop.Run(); run_loop.Run();
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerBrowserTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerBrowserTest,
FetchPageWithSaveDataPassThroughOnFetch) { FetchPageWithSaveDataPassThroughOnFetch) {
const char kPageUrl[] = "/service_worker/pass_through_fetch.html"; const char kPageUrl[] = "/service_worker/pass_through_fetch.html";
const char kWorkerUrl[] = "/service_worker/fetch_event_pass_through.js"; const char kWorkerUrl[] = "/service_worker/fetch_event_pass_through.js";
...@@ -1904,7 +1891,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerBrowserTest, ...@@ -1904,7 +1891,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerBrowserTest,
run_loop.Run(); run_loop.Run();
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerBrowserTest, Reload) { IN_PROC_BROWSER_TEST_F(ServiceWorkerBrowserTest, Reload) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
const char kPageUrl[] = "/service_worker/reload.html"; const char kPageUrl[] = "/service_worker/reload.html";
const char kWorkerUrl[] = "/service_worker/fetch_event_reload.js"; const char kWorkerUrl[] = "/service_worker/fetch_event_reload.js";
...@@ -1944,7 +1931,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerBrowserTest, Reload) { ...@@ -1944,7 +1931,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerBrowserTest, Reload) {
// renderer should continue processing events on the service worker instead of // renderer should continue processing events on the service worker instead of
// waiting for termination or an event from the browser. Regression test for // waiting for termination or an event from the browser. Regression test for
// https://crbug.com/878667. // https://crbug.com/878667.
IN_PROC_BROWSER_TEST_P(ServiceWorkerBrowserTest, IdleTimerWithDevTools) { IN_PROC_BROWSER_TEST_F(ServiceWorkerBrowserTest, IdleTimerWithDevTools) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
// Register a service worker. // Register a service worker.
...@@ -2240,7 +2227,7 @@ const std::string ...@@ -2240,7 +2227,7 @@ const std::string
" result => event.source.postMessage(result)));\n" " result => event.source.postMessage(result)));\n"
" });"; " });";
IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, NetworkFallback) { IN_PROC_BROWSER_TEST_F(ServiceWorkerNavigationPreloadTest, NetworkFallback) {
const char kPageUrl[] = "/service_worker/navigation_preload.html"; const char kPageUrl[] = "/service_worker/navigation_preload.html";
const char kWorkerUrl[] = "/service_worker/navigation_preload.js"; const char kWorkerUrl[] = "/service_worker/navigation_preload.js";
const char kPage[] = "<title>PASS</title>Hello world."; const char kPage[] = "<title>PASS</title>Hello world.";
...@@ -2279,7 +2266,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, NetworkFallback) { ...@@ -2279,7 +2266,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, NetworkFallback) {
EXPECT_GT(fallback_count, 0); EXPECT_GT(fallback_count, 0);
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, SetHeaderValue) { IN_PROC_BROWSER_TEST_F(ServiceWorkerNavigationPreloadTest, SetHeaderValue) {
const std::string kPageUrl = "/service_worker/navigation_preload.html"; const std::string kPageUrl = "/service_worker/navigation_preload.html";
const std::string kWorkerUrl = "/service_worker/navigation_preload.js"; const std::string kWorkerUrl = "/service_worker/navigation_preload.js";
const std::string kPage = "<title>FROM_SERVER</title>"; const std::string kPage = "<title>FROM_SERVER</title>";
...@@ -2364,7 +2351,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, SetHeaderValue) { ...@@ -2364,7 +2351,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, SetHeaderValue) {
ASSERT_EQ(0, GetRequestCount(kPageUrl4)); ASSERT_EQ(0, GetRequestCount(kPageUrl4));
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerNavigationPreloadTest,
RespondWithNavigationPreload) { RespondWithNavigationPreload) {
const char kPageUrl[] = "/service_worker/navigation_preload.html"; const char kPageUrl[] = "/service_worker/navigation_preload.html";
const char kWorkerUrl[] = "/service_worker/navigation_preload.js"; const char kWorkerUrl[] = "/service_worker/navigation_preload.js";
...@@ -2395,7 +2382,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, ...@@ -2395,7 +2382,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest,
request_log_[kPageUrl][0].headers[kNavigationPreloadHeaderName]); request_log_[kPageUrl][0].headers[kNavigationPreloadHeaderName]);
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, GetResponseText) { IN_PROC_BROWSER_TEST_F(ServiceWorkerNavigationPreloadTest, GetResponseText) {
const char kPageUrl[] = "/service_worker/navigation_preload.html"; const char kPageUrl[] = "/service_worker/navigation_preload.html";
const char kWorkerUrl[] = "/service_worker/navigation_preload.js"; const char kWorkerUrl[] = "/service_worker/navigation_preload.js";
const char kPage[] = "<title>PASS</title>Hello world."; const char kPage[] = "<title>PASS</title>Hello world.";
...@@ -2423,7 +2410,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, GetResponseText) { ...@@ -2423,7 +2410,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, GetResponseText) {
EXPECT_EQ(1, GetRequestCount(kPageUrl)); EXPECT_EQ(1, GetRequestCount(kPageUrl));
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerNavigationPreloadTest,
GetLargeResponseText) { GetLargeResponseText) {
const char kPageUrl[] = "/service_worker/navigation_preload.html"; const char kPageUrl[] = "/service_worker/navigation_preload.html";
const char kWorkerUrl[] = "/service_worker/navigation_preload.js"; const char kWorkerUrl[] = "/service_worker/navigation_preload.js";
...@@ -2460,7 +2447,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, ...@@ -2460,7 +2447,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest,
EXPECT_EQ(1, GetRequestCount(kPageUrl)); EXPECT_EQ(1, GetRequestCount(kPageUrl));
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerNavigationPreloadTest,
GetLargeResponseCloneText) { GetLargeResponseCloneText) {
const char kPageUrl[] = "/service_worker/navigation_preload.html"; const char kPageUrl[] = "/service_worker/navigation_preload.html";
const char kWorkerUrl[] = "/service_worker/navigation_preload.js"; const char kWorkerUrl[] = "/service_worker/navigation_preload.js";
...@@ -2498,7 +2485,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, ...@@ -2498,7 +2485,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest,
EXPECT_EQ(1, GetRequestCount(kPageUrl)); EXPECT_EQ(1, GetRequestCount(kPageUrl));
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerNavigationPreloadTest,
GetLargeResponseReadableStream) { GetLargeResponseReadableStream) {
const char kPageUrl[] = "/service_worker/navigation_preload.html"; const char kPageUrl[] = "/service_worker/navigation_preload.html";
const char kWorkerUrl[] = "/service_worker/navigation_preload.js"; const char kWorkerUrl[] = "/service_worker/navigation_preload.js";
...@@ -2547,7 +2534,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, ...@@ -2547,7 +2534,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest,
EXPECT_EQ(1, GetRequestCount(kPageUrl)); EXPECT_EQ(1, GetRequestCount(kPageUrl));
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, NetworkError) { IN_PROC_BROWSER_TEST_F(ServiceWorkerNavigationPreloadTest, NetworkError) {
const char kPageUrl[] = "/service_worker/navigation_preload.html"; const char kPageUrl[] = "/service_worker/navigation_preload.html";
const char kWorkerUrl[] = "/service_worker/navigation_preload.js"; const char kWorkerUrl[] = "/service_worker/navigation_preload.js";
const GURL page_url = embedded_test_server()->GetURL(kPageUrl); const GURL page_url = embedded_test_server()->GetURL(kPageUrl);
...@@ -2580,7 +2567,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, NetworkError) { ...@@ -2580,7 +2567,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, NetworkError) {
EXPECT_NE(base::string16::npos, messages[0].find(expected)); EXPECT_NE(base::string16::npos, messages[0].find(expected));
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerNavigationPreloadTest,
PreloadHeadersSimple) { PreloadHeadersSimple) {
const char kPageUrl[] = "/service_worker/navigation_preload.html"; const char kPageUrl[] = "/service_worker/navigation_preload.html";
const char kWorkerUrl[] = "/service_worker/navigation_preload.js"; const char kWorkerUrl[] = "/service_worker/navigation_preload.js";
...@@ -2610,7 +2597,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, ...@@ -2610,7 +2597,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest,
base::NumberToString(sizeof(kPage) - 1))); base::NumberToString(sizeof(kPage) - 1)));
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, NotEnabled) { IN_PROC_BROWSER_TEST_F(ServiceWorkerNavigationPreloadTest, NotEnabled) {
const char kPageUrl[] = "/service_worker/navigation_preload.html"; const char kPageUrl[] = "/service_worker/navigation_preload.html";
const char kWorkerUrl[] = "/service_worker/navigation_preload.js"; const char kWorkerUrl[] = "/service_worker/navigation_preload.js";
const char kPage[] = "<title>ERROR</title>Hello world."; const char kPage[] = "<title>ERROR</title>Hello world.";
...@@ -2627,7 +2614,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, NotEnabled) { ...@@ -2627,7 +2614,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, NotEnabled) {
EXPECT_EQ(0, GetRequestCount(kPageUrl)); EXPECT_EQ(0, GetRequestCount(kPageUrl));
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerNavigationPreloadTest,
PreloadHeadersCustom) { PreloadHeadersCustom) {
const char kPageUrl[] = "/service_worker/navigation_preload.html"; const char kPageUrl[] = "/service_worker/navigation_preload.html";
const char kWorkerUrl[] = "/service_worker/navigation_preload.js"; const char kWorkerUrl[] = "/service_worker/navigation_preload.js";
...@@ -2670,7 +2657,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, ...@@ -2670,7 +2657,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest,
EXPECT_FALSE(HasHeader(*dict, "set-cookie2")); EXPECT_FALSE(HasHeader(*dict, "set-cookie2"));
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerNavigationPreloadTest,
InvalidRedirect_MultiLocation) { InvalidRedirect_MultiLocation) {
const char kPageUrl[] = "/service_worker/navigation_preload.html"; const char kPageUrl[] = "/service_worker/navigation_preload.html";
const char kWorkerUrl[] = "/service_worker/navigation_preload.js"; const char kWorkerUrl[] = "/service_worker/navigation_preload.js";
...@@ -2717,7 +2704,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, ...@@ -2717,7 +2704,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest,
EXPECT_EQ(0, GetRequestCount(kRedirectedPageUrl2)); EXPECT_EQ(0, GetRequestCount(kRedirectedPageUrl2));
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerNavigationPreloadTest,
InvalidRedirect_InvalidLocation) { InvalidRedirect_InvalidLocation) {
const char kPageUrl[] = "/service_worker/navigation_preload.html"; const char kPageUrl[] = "/service_worker/navigation_preload.html";
const char kWorkerUrl[] = "/service_worker/navigation_preload.js"; const char kWorkerUrl[] = "/service_worker/navigation_preload.js";
...@@ -2747,7 +2734,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, ...@@ -2747,7 +2734,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest,
// Tests responding with the navigation preload response when the navigation // Tests responding with the navigation preload response when the navigation
// occurred after a redirect. // occurred after a redirect.
IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerNavigationPreloadTest,
RedirectAndRespondWithNavigationPreload) { RedirectAndRespondWithNavigationPreload) {
const std::string kPageUrl = "/service_worker/navigation_preload.html"; const std::string kPageUrl = "/service_worker/navigation_preload.html";
const char kWorkerUrl[] = "/service_worker/navigation_preload.js"; const char kWorkerUrl[] = "/service_worker/navigation_preload.js";
...@@ -2812,7 +2799,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, ...@@ -2812,7 +2799,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest,
EXPECT_EQ(1, GetRequestCount(kPageUrl + "?3")); EXPECT_EQ(1, GetRequestCount(kPageUrl + "?3"));
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerBrowserTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerBrowserTest,
ResponseFromHTTPSServiceWorkerIsMarkedAsSecure) { ResponseFromHTTPSServiceWorkerIsMarkedAsSecure) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
const char kPageUrl[] = "/service_worker/fetch_event_blob.html"; const char kPageUrl[] = "/service_worker/fetch_event_blob.html";
...@@ -2854,7 +2841,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerBrowserTest, ...@@ -2854,7 +2841,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerBrowserTest,
run_loop.Run(); run_loop.Run();
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerBrowserTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerBrowserTest,
ResponseFromHTTPServiceWorkerIsNotMarkedAsSecure) { ResponseFromHTTPServiceWorkerIsNotMarkedAsSecure) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
const char kPageUrl[] = "/service_worker/fetch_event_blob.html"; const char kPageUrl[] = "/service_worker/fetch_event_blob.html";
...@@ -2891,7 +2878,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerBrowserTest, ...@@ -2891,7 +2878,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerBrowserTest,
run_loop.Run(); run_loop.Run();
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerBrowserTest, ImportsBustMemcache) { IN_PROC_BROWSER_TEST_F(ServiceWorkerBrowserTest, ImportsBustMemcache) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
const char kScopeUrl[] = "/service_worker/imports_bust_memcache_scope/"; const char kScopeUrl[] = "/service_worker/imports_bust_memcache_scope/";
const char kPageUrl[] = "/service_worker/imports_bust_memcache.html"; const char kPageUrl[] = "/service_worker/imports_bust_memcache.html";
...@@ -2948,7 +2935,7 @@ class WorkerRunningStatusObserver : public ServiceWorkerContextObserver { ...@@ -2948,7 +2935,7 @@ class WorkerRunningStatusObserver : public ServiceWorkerContextObserver {
int64_t version_id_ = blink::mojom::kInvalidServiceWorkerVersionId; int64_t version_id_ = blink::mojom::kInvalidServiceWorkerVersionId;
}; };
IN_PROC_BROWSER_TEST_P(ServiceWorkerBrowserTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerBrowserTest,
GetAllServiceWorkerRunningInfos) { GetAllServiceWorkerRunningInfos) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
WorkerRunningStatusObserver observer(public_context()); WorkerRunningStatusObserver observer(public_context());
...@@ -2971,7 +2958,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerBrowserTest, ...@@ -2971,7 +2958,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerBrowserTest,
infos[0].process_id); infos[0].process_id);
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerBrowserTest, GetServiceWorkerRunningInfo) { IN_PROC_BROWSER_TEST_F(ServiceWorkerBrowserTest, GetServiceWorkerRunningInfo) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
WorkerRunningStatusObserver observer(public_context()); WorkerRunningStatusObserver observer(public_context());
EXPECT_TRUE(NavigateToURL(shell(), EXPECT_TRUE(NavigateToURL(shell(),
...@@ -3012,7 +2999,7 @@ class StopObserver : public ServiceWorkerVersion::Observer { ...@@ -3012,7 +2999,7 @@ class StopObserver : public ServiceWorkerVersion::Observer {
base::OnceClosure quit_closure_; base::OnceClosure quit_closure_;
}; };
IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserTest, RendererCrash) { IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, RendererCrash) {
// Start a worker. // Start a worker.
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
RunOnIOThread(base::BindOnce(&self::SetUpRegistrationOnIOThread, RunOnIOThread(base::BindOnce(&self::SetUpRegistrationOnIOThread,
...@@ -3068,7 +3055,7 @@ static int CountRenderProcessHosts() { ...@@ -3068,7 +3055,7 @@ static int CountRenderProcessHosts() {
return RenderProcessHost::GetCurrentRenderProcessCountForTesting(); return RenderProcessHost::GetCurrentRenderProcessCountForTesting();
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerBlackBoxBrowserTest, Registration) { IN_PROC_BROWSER_TEST_F(ServiceWorkerBlackBoxBrowserTest, Registration) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
// Close the only window to be sure we're not re-using its RenderProcessHost. // Close the only window to be sure we're not re-using its RenderProcessHost.
shell()->Close(); shell()->Close();
...@@ -3201,7 +3188,7 @@ class ServiceWorkerVersionBrowserV8FullCodeCacheTest ...@@ -3201,7 +3188,7 @@ class ServiceWorkerVersionBrowserV8FullCodeCacheTest
size_t metadata_size_ = 0; size_t metadata_size_ = 0;
}; };
IN_PROC_BROWSER_TEST_P(ServiceWorkerVersionBrowserV8FullCodeCacheTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserV8FullCodeCacheTest,
FullCode) { FullCode) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
RunOnIOThread(base::BindOnce(&self::SetUpRegistrationAndListenerOnIOThread, RunOnIOThread(base::BindOnce(&self::SetUpRegistrationAndListenerOnIOThread,
...@@ -3385,7 +3372,7 @@ const char ServiceWorkerV8CodeCacheForCacheStorageTest::kWorkerUrl[] = ...@@ -3385,7 +3372,7 @@ const char ServiceWorkerV8CodeCacheForCacheStorageTest::kWorkerUrl[] =
const char ServiceWorkerV8CodeCacheForCacheStorageTest::kScriptUrl[] = const char ServiceWorkerV8CodeCacheForCacheStorageTest::kScriptUrl[] =
"/service_worker/v8_cache_test.js"; "/service_worker/v8_cache_test.js";
IN_PROC_BROWSER_TEST_P(ServiceWorkerV8CodeCacheForCacheStorageTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerV8CodeCacheForCacheStorageTest,
V8CacheOnCacheStorage) { V8CacheOnCacheStorage) {
RegisterAndActivateServiceWorker(); RegisterAndActivateServiceWorker();
...@@ -3413,7 +3400,7 @@ class ServiceWorkerV8CodeCacheForCacheStorageNoneTest ...@@ -3413,7 +3400,7 @@ class ServiceWorkerV8CodeCacheForCacheStorageNoneTest
DISALLOW_COPY_AND_ASSIGN(ServiceWorkerV8CodeCacheForCacheStorageNoneTest); DISALLOW_COPY_AND_ASSIGN(ServiceWorkerV8CodeCacheForCacheStorageNoneTest);
}; };
IN_PROC_BROWSER_TEST_P(ServiceWorkerV8CodeCacheForCacheStorageNoneTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerV8CodeCacheForCacheStorageNoneTest,
V8CacheOnCacheStorage) { V8CacheOnCacheStorage) {
RegisterAndActivateServiceWorker(); RegisterAndActivateServiceWorker();
...@@ -3492,6 +3479,8 @@ class ServiceWorkerCodeCacheStrategyTestBase : public ServiceWorkerBrowserTest { ...@@ -3492,6 +3479,8 @@ class ServiceWorkerCodeCacheStrategyTestBase : public ServiceWorkerBrowserTest {
} }
} }
base::test::ScopedFeatureList feature_list_;
DISALLOW_COPY_AND_ASSIGN(ServiceWorkerCodeCacheStrategyTestBase); DISALLOW_COPY_AND_ASSIGN(ServiceWorkerCodeCacheStrategyTestBase);
}; };
...@@ -3515,16 +3504,11 @@ class ServiceWorkerCodeCacheStrategyDontGenerateTest ...@@ -3515,16 +3504,11 @@ class ServiceWorkerCodeCacheStrategyDontGenerateTest
feature_list_.InitAndEnableFeatureWithParameters( feature_list_.InitAndEnableFeatureWithParameters(
blink::features::kServiceWorkerAggressiveCodeCache, blink::features::kServiceWorkerAggressiveCodeCache,
{{blink::kServiceWorkerEagerCodeCacheStrategy, "dontgenerate"}}); {{blink::kServiceWorkerEagerCodeCacheStrategy, "dontgenerate"}});
// Call ContentBrowserTest::SetUp() to avoid initializing |feature_list_| ServiceWorkerCodeCacheStrategyTestBase::SetUp();
// twice.
// TODO(crbug.com/967272): Change this to call
// ServiceWorkerCodeCacheStrategyTestBase::SetUp() once we fully ship
// off-the-main-thread script fetch.
ContentBrowserTest::SetUp();
} }
}; };
IN_PROC_BROWSER_TEST_P(ServiceWorkerCodeCacheStrategyDontGenerateTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerCodeCacheStrategyDontGenerateTest,
DontGenerate) { DontGenerate) {
NavigateToTestPage(); NavigateToTestPage();
InitiateEventsToCacheScript(); InitiateEventsToCacheScript();
...@@ -3540,16 +3524,11 @@ class ServiceWorkerCodeCacheStrategyInstallEventTest ...@@ -3540,16 +3524,11 @@ class ServiceWorkerCodeCacheStrategyInstallEventTest
feature_list_.InitAndEnableFeatureWithParameters( feature_list_.InitAndEnableFeatureWithParameters(
blink::features::kServiceWorkerAggressiveCodeCache, blink::features::kServiceWorkerAggressiveCodeCache,
{{blink::kServiceWorkerEagerCodeCacheStrategy, "installevent"}}); {{blink::kServiceWorkerEagerCodeCacheStrategy, "installevent"}});
// Call ContentBrowserTest::SetUp() to avoid initializing |feature_list_| ServiceWorkerCodeCacheStrategyTestBase::SetUp();
// twice.
// TODO(crbug.com/967272): Change this to call
// ServiceWorkerCodeCacheStrategyTestBase::SetUp() once we fully ship
// off-the-main-thread script fetch.
ContentBrowserTest::SetUp();
} }
}; };
IN_PROC_BROWSER_TEST_P(ServiceWorkerCodeCacheStrategyInstallEventTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerCodeCacheStrategyInstallEventTest,
GenerateInInstallEvent) { GenerateInInstallEvent) {
NavigateToTestPage(); NavigateToTestPage();
InitiateEventsToCacheScript(); InitiateEventsToCacheScript();
...@@ -3565,16 +3544,11 @@ class ServiceWorkerCodeCacheStrategyIdleTaskTest ...@@ -3565,16 +3544,11 @@ class ServiceWorkerCodeCacheStrategyIdleTaskTest
feature_list_.InitAndEnableFeatureWithParameters( feature_list_.InitAndEnableFeatureWithParameters(
blink::features::kServiceWorkerAggressiveCodeCache, blink::features::kServiceWorkerAggressiveCodeCache,
{{blink::kServiceWorkerEagerCodeCacheStrategy, "idletask"}}); {{blink::kServiceWorkerEagerCodeCacheStrategy, "idletask"}});
// Call ContentBrowserTest::SetUp() to avoid initializing |feature_list_| ServiceWorkerCodeCacheStrategyTestBase::SetUp();
// twice.
// TODO(crbug.com/967272): Change this to call
// ServiceWorkerCodeCacheStrategyTestBase::SetUp() once we fully ship
// off-the-main-thread script fetch.
ContentBrowserTest::SetUp();
} }
}; };
IN_PROC_BROWSER_TEST_P(ServiceWorkerCodeCacheStrategyIdleTaskTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerCodeCacheStrategyIdleTaskTest,
GenerateInIdleTask) { GenerateInIdleTask) {
NavigateToTestPage(); NavigateToTestPage();
InitiateEventsToCacheScript(); InitiateEventsToCacheScript();
...@@ -3586,7 +3560,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerCodeCacheStrategyIdleTaskTest, ...@@ -3586,7 +3560,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerCodeCacheStrategyIdleTaskTest,
// Test that generating and storing code cache in idle tasks doesn't corrupt // Test that generating and storing code cache in idle tasks doesn't corrupt
// cache entry when Cache#put() is called twice asynchronously. // cache entry when Cache#put() is called twice asynchronously.
IN_PROC_BROWSER_TEST_P(ServiceWorkerCodeCacheStrategyIdleTaskTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerCodeCacheStrategyIdleTaskTest,
CacheScriptTwice) { CacheScriptTwice) {
const char kCachedTwiceUrl[] = const char kCachedTwiceUrl[] =
"/service_worker/code_cache_strategy_test_script.js?cached_twice"; "/service_worker/code_cache_strategy_test_script.js?cached_twice";
...@@ -3654,7 +3628,7 @@ class ServiceWorkerDisableWebSecurityTest : public ServiceWorkerBrowserTest { ...@@ -3654,7 +3628,7 @@ class ServiceWorkerDisableWebSecurityTest : public ServiceWorkerBrowserTest {
DISALLOW_COPY_AND_ASSIGN(ServiceWorkerDisableWebSecurityTest); DISALLOW_COPY_AND_ASSIGN(ServiceWorkerDisableWebSecurityTest);
}; };
IN_PROC_BROWSER_TEST_P(ServiceWorkerDisableWebSecurityTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerDisableWebSecurityTest,
GetRegistrationNoCrash) { GetRegistrationNoCrash) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
const char kPageUrl[] = const char kPageUrl[] =
...@@ -3663,14 +3637,14 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerDisableWebSecurityTest, ...@@ -3663,14 +3637,14 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerDisableWebSecurityTest,
RunTestWithCrossOriginURL(kPageUrl, kScopeUrl); RunTestWithCrossOriginURL(kPageUrl, kScopeUrl);
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerDisableWebSecurityTest, RegisterNoCrash) { IN_PROC_BROWSER_TEST_F(ServiceWorkerDisableWebSecurityTest, RegisterNoCrash) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
const char kPageUrl[] = "/service_worker/disable_web_security_register.html"; const char kPageUrl[] = "/service_worker/disable_web_security_register.html";
const char kScopeUrl[] = "/service_worker/"; const char kScopeUrl[] = "/service_worker/";
RunTestWithCrossOriginURL(kPageUrl, kScopeUrl); RunTestWithCrossOriginURL(kPageUrl, kScopeUrl);
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerDisableWebSecurityTest, UnregisterNoCrash) { IN_PROC_BROWSER_TEST_F(ServiceWorkerDisableWebSecurityTest, UnregisterNoCrash) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
const char kPageUrl[] = const char kPageUrl[] =
"/service_worker/disable_web_security_unregister.html"; "/service_worker/disable_web_security_unregister.html";
...@@ -3680,7 +3654,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerDisableWebSecurityTest, UnregisterNoCrash) { ...@@ -3680,7 +3654,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerDisableWebSecurityTest, UnregisterNoCrash) {
RunTestWithCrossOriginURL(kPageUrl, kScopeUrl); RunTestWithCrossOriginURL(kPageUrl, kScopeUrl);
} }
IN_PROC_BROWSER_TEST_P(ServiceWorkerDisableWebSecurityTest, UpdateNoCrash) { IN_PROC_BROWSER_TEST_F(ServiceWorkerDisableWebSecurityTest, UpdateNoCrash) {
StartServerAndNavigateToSetup(); StartServerAndNavigateToSetup();
const char kPageUrl[] = "/service_worker/disable_web_security_update.html"; const char kPageUrl[] = "/service_worker/disable_web_security_update.html";
const char kScopeUrl[] = "/service_worker/scope/"; const char kScopeUrl[] = "/service_worker/scope/";
...@@ -3779,7 +3753,7 @@ class ServiceWorkerURLLoaderThrottleTest : public ServiceWorkerBrowserTest { ...@@ -3779,7 +3753,7 @@ class ServiceWorkerURLLoaderThrottleTest : public ServiceWorkerBrowserTest {
// Test that the throttles can inject headers during navigation that are // Test that the throttles can inject headers during navigation that are
// observable inside the service worker's fetch event. // observable inside the service worker's fetch event.
IN_PROC_BROWSER_TEST_P(ServiceWorkerURLLoaderThrottleTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerURLLoaderThrottleTest,
FetchEventForNavigationHasThrottledRequest) { FetchEventForNavigationHasThrottledRequest) {
// Add a throttle which injects a header. // Add a throttle which injects a header.
ThrottlingContentBrowserClient content_browser_client; ThrottlingContentBrowserClient content_browser_client;
...@@ -3815,7 +3789,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerURLLoaderThrottleTest, ...@@ -3815,7 +3789,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerURLLoaderThrottleTest,
} }
// Test that redirects by throttles occur before service worker interception. // Test that redirects by throttles occur before service worker interception.
IN_PROC_BROWSER_TEST_P(ServiceWorkerURLLoaderThrottleTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerURLLoaderThrottleTest,
RedirectOccursBeforeFetchEvent) { RedirectOccursBeforeFetchEvent) {
// Add a throttle which performs a redirect. // Add a throttle which performs a redirect.
ThrottlingContentBrowserClient content_browser_client; ThrottlingContentBrowserClient content_browser_client;
...@@ -3859,7 +3833,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerURLLoaderThrottleTest, ...@@ -3859,7 +3833,7 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerURLLoaderThrottleTest,
// Test that the headers injected by throttles during navigation are // Test that the headers injected by throttles during navigation are
// present in the network request in the case of network fallback. // present in the network request in the case of network fallback.
IN_PROC_BROWSER_TEST_P( IN_PROC_BROWSER_TEST_F(
ServiceWorkerURLLoaderThrottleTest, ServiceWorkerURLLoaderThrottleTest,
NavigationHasThrottledRequestHeadersAfterNetworkFallback) { NavigationHasThrottledRequestHeadersAfterNetworkFallback) {
// Add a throttle which injects a header. // Add a throttle which injects a header.
...@@ -3890,7 +3864,7 @@ IN_PROC_BROWSER_TEST_P( ...@@ -3890,7 +3864,7 @@ IN_PROC_BROWSER_TEST_P(
// Test that the headers injected by throttles during navigation are // Test that the headers injected by throttles during navigation are
// present in the navigation preload request. // present in the navigation preload request.
IN_PROC_BROWSER_TEST_P(ServiceWorkerURLLoaderThrottleTest, IN_PROC_BROWSER_TEST_F(ServiceWorkerURLLoaderThrottleTest,
NavigationPreloadHasThrottledRequestHeaders) { NavigationPreloadHasThrottledRequestHeaders) {
// Add a throttle which injects a header. // Add a throttle which injects a header.
ThrottlingContentBrowserClient content_browser_client; ThrottlingContentBrowserClient content_browser_client;
...@@ -3919,61 +3893,4 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerURLLoaderThrottleTest, ...@@ -3919,61 +3893,4 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerURLLoaderThrottleTest,
SetBrowserClientForTesting(old_content_browser_client); SetBrowserClientForTesting(old_content_browser_client);
} }
// TODO(crbug.com/967272): Remove following parameterized tests once we fully
// ship off-the-main-thread script fetch.
INSTANTIATE_TEST_SUITE_P(ServiceWorkerBrowserTestOnMainThreadFetch,
ServiceWorkerBrowserTest,
testing::Bool());
INSTANTIATE_TEST_SUITE_P(ServiceWorkerVersionBrowserTestOnMainThreadFetch,
ServiceWorkerVersionBrowserTest,
testing::Bool());
INSTANTIATE_TEST_SUITE_P(ServiceWorkerNavigationPreloadTestOnMainThreadFetch,
ServiceWorkerNavigationPreloadTest,
testing::Bool());
INSTANTIATE_TEST_SUITE_P(ServiceWorkerDisableWebSecurityTestOnMainThreadFetch,
ServiceWorkerDisableWebSecurityTest,
testing::Bool());
INSTANTIATE_TEST_SUITE_P(ServiceWorkerURLLoaderThrottleTestOnMainThreadFetch,
ServiceWorkerURLLoaderThrottleTest,
testing::Bool());
INSTANTIATE_TEST_SUITE_P(ServiceWorkerBlackBoxBrowserTestOnMainThreadFetch,
ServiceWorkerBlackBoxBrowserTest,
testing::Bool());
INSTANTIATE_TEST_SUITE_P(
ServiceWorkerCodeCacheStrategyDontGenerateTestOnMainThreadFetch,
ServiceWorkerCodeCacheStrategyDontGenerateTest,
testing::Bool());
INSTANTIATE_TEST_SUITE_P(
ServiceWorkerCodeCacheStrategyIdleTaskTestOnMainThreadFetch,
ServiceWorkerCodeCacheStrategyIdleTaskTest,
testing::Bool());
INSTANTIATE_TEST_SUITE_P(
ServiceWorkerCodeCacheStrategyInstallEventTestOnMainThreadFetch,
ServiceWorkerCodeCacheStrategyInstallEventTest,
testing::Bool());
INSTANTIATE_TEST_SUITE_P(
ServiceWorkerV8CodeCacheForCacheStorageNoneTestOnMainThreadFetch,
ServiceWorkerV8CodeCacheForCacheStorageNoneTest,
testing::Bool());
INSTANTIATE_TEST_SUITE_P(
ServiceWorkerV8CodeCacheForCacheStorageTestOnMainThreadFetch,
ServiceWorkerV8CodeCacheForCacheStorageTest,
testing::Bool());
INSTANTIATE_TEST_SUITE_P(
ServiceWorkerVersionBrowserV8FullCodeCacheTestOnMainThreadFetch,
ServiceWorkerVersionBrowserV8FullCodeCacheTest,
testing::Bool());
} // namespace content } // namespace content
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