| Index: content/browser/service_worker/link_header_support_unittest.cc
|
| diff --git a/content/browser/service_worker/link_header_support_unittest.cc b/content/browser/service_worker/link_header_support_unittest.cc
|
| index 1b0598b71606d61cd52bb9ede5f0000312ad0e56..91798028cd09a9698dd52eb6bd9361a36d66000d 100644
|
| --- a/content/browser/service_worker/link_header_support_unittest.cc
|
| +++ b/content/browser/service_worker/link_header_support_unittest.cc
|
| @@ -155,10 +155,7 @@ class LinkHeaderServiceWorkerTest : public ::testing::Test {
|
| storage::BlobStorageContext blob_storage_context_;
|
| };
|
|
|
| -class LinkHeaderServiceWorkerTestP
|
| - : public MojoServiceWorkerTestP<LinkHeaderServiceWorkerTest> {};
|
| -
|
| -TEST_P(LinkHeaderServiceWorkerTestP, InstallServiceWorker_Basic) {
|
| +TEST_F(LinkHeaderServiceWorkerTest, InstallServiceWorker_Basic) {
|
| ProcessLinkHeaderForRequest(
|
| CreateSubresourceRequest(GURL("https://example.com/foo/bar/")).get(),
|
| "<../foo.js>; rel=serviceworker", context_wrapper());
|
| @@ -171,7 +168,7 @@ TEST_P(LinkHeaderServiceWorkerTestP, InstallServiceWorker_Basic) {
|
| registrations[0].active_version.script_url);
|
| }
|
|
|
| -TEST_P(LinkHeaderServiceWorkerTestP, InstallServiceWorker_ScopeWithFragment) {
|
| +TEST_F(LinkHeaderServiceWorkerTest, InstallServiceWorker_ScopeWithFragment) {
|
| ProcessLinkHeaderForRequest(
|
| CreateSubresourceRequest(GURL("https://example.com/foo/bar/")).get(),
|
| "<../bar.js>; rel=serviceworker; scope=\"scope#ref\"", context_wrapper());
|
| @@ -185,7 +182,7 @@ TEST_P(LinkHeaderServiceWorkerTestP, InstallServiceWorker_ScopeWithFragment) {
|
| registrations[0].active_version.script_url);
|
| }
|
|
|
| -TEST_P(LinkHeaderServiceWorkerTestP, InstallServiceWorker_ScopeAbsoluteUrl) {
|
| +TEST_F(LinkHeaderServiceWorkerTest, InstallServiceWorker_ScopeAbsoluteUrl) {
|
| ProcessLinkHeaderForRequest(
|
| CreateSubresourceRequest(GURL("https://example.com/foo/bar/")).get(),
|
| "<bar.js>; rel=serviceworker; "
|
| @@ -201,8 +198,7 @@ TEST_P(LinkHeaderServiceWorkerTestP, InstallServiceWorker_ScopeAbsoluteUrl) {
|
| registrations[0].active_version.script_url);
|
| }
|
|
|
| -TEST_P(LinkHeaderServiceWorkerTestP,
|
| - InstallServiceWorker_ScopeDifferentOrigin) {
|
| +TEST_F(LinkHeaderServiceWorkerTest, InstallServiceWorker_ScopeDifferentOrigin) {
|
| ProcessLinkHeaderForRequest(
|
| CreateSubresourceRequest(GURL("https://example.com/foobar/")).get(),
|
| "<bar.js>; rel=serviceworker; scope=\"https://google.com/scope\"",
|
| @@ -213,8 +209,7 @@ TEST_P(LinkHeaderServiceWorkerTestP,
|
| ASSERT_EQ(0u, registrations.size());
|
| }
|
|
|
| -TEST_P(LinkHeaderServiceWorkerTestP,
|
| - InstallServiceWorker_ScopeUrlEncodedSlash) {
|
| +TEST_F(LinkHeaderServiceWorkerTest, InstallServiceWorker_ScopeUrlEncodedSlash) {
|
| ProcessLinkHeaderForRequest(
|
| CreateSubresourceRequest(GURL("https://example.com/foobar/")).get(),
|
| "<bar.js>; rel=serviceworker; scope=\"./foo%2Fbar\"", context_wrapper());
|
| @@ -224,7 +219,7 @@ TEST_P(LinkHeaderServiceWorkerTestP,
|
| ASSERT_EQ(0u, registrations.size());
|
| }
|
|
|
| -TEST_P(LinkHeaderServiceWorkerTestP,
|
| +TEST_F(LinkHeaderServiceWorkerTest,
|
| InstallServiceWorker_ScriptUrlEncodedSlash) {
|
| ProcessLinkHeaderForRequest(
|
| CreateSubresourceRequest(GURL("https://example.com/foobar/")).get(),
|
| @@ -235,7 +230,7 @@ TEST_P(LinkHeaderServiceWorkerTestP,
|
| ASSERT_EQ(0u, registrations.size());
|
| }
|
|
|
| -TEST_P(LinkHeaderServiceWorkerTestP, InstallServiceWorker_ScriptAbsoluteUrl) {
|
| +TEST_F(LinkHeaderServiceWorkerTest, InstallServiceWorker_ScriptAbsoluteUrl) {
|
| ProcessLinkHeaderForRequest(
|
| CreateSubresourceRequest(GURL("https://example.com/foobar/")).get(),
|
| "<https://example.com/bar.js>; rel=serviceworker; scope=foo",
|
| @@ -249,7 +244,7 @@ TEST_P(LinkHeaderServiceWorkerTestP, InstallServiceWorker_ScriptAbsoluteUrl) {
|
| registrations[0].active_version.script_url);
|
| }
|
|
|
| -TEST_P(LinkHeaderServiceWorkerTestP,
|
| +TEST_F(LinkHeaderServiceWorkerTest,
|
| InstallServiceWorker_ScriptDifferentOrigin) {
|
| ProcessLinkHeaderForRequest(
|
| CreateSubresourceRequest(GURL("https://example.com/foobar/")).get(),
|
| @@ -261,7 +256,7 @@ TEST_P(LinkHeaderServiceWorkerTestP,
|
| ASSERT_EQ(0u, registrations.size());
|
| }
|
|
|
| -TEST_P(LinkHeaderServiceWorkerTestP, InstallServiceWorker_MultipleWorkers) {
|
| +TEST_F(LinkHeaderServiceWorkerTest, InstallServiceWorker_MultipleWorkers) {
|
| ProcessLinkHeaderForRequest(
|
| CreateSubresourceRequest(GURL("https://example.com/foobar/")).get(),
|
| "<bar.js>; rel=serviceworker; scope=foo, <baz.js>; "
|
| @@ -279,7 +274,7 @@ TEST_P(LinkHeaderServiceWorkerTestP, InstallServiceWorker_MultipleWorkers) {
|
| registrations[1].active_version.script_url);
|
| }
|
|
|
| -TEST_P(LinkHeaderServiceWorkerTestP,
|
| +TEST_F(LinkHeaderServiceWorkerTest,
|
| InstallServiceWorker_ValidAndInvalidValues) {
|
| ProcessLinkHeaderForRequest(
|
| CreateSubresourceRequest(GURL("https://example.com/foobar/")).get(),
|
| @@ -295,7 +290,7 @@ TEST_P(LinkHeaderServiceWorkerTestP,
|
| registrations[0].active_version.script_url);
|
| }
|
|
|
| -TEST_P(LinkHeaderServiceWorkerTestP, InstallServiceWorker_InsecureContext) {
|
| +TEST_F(LinkHeaderServiceWorkerTest, InstallServiceWorker_InsecureContext) {
|
| std::unique_ptr<net::URLRequest> request =
|
| CreateSubresourceRequest(GURL("https://example.com/foo/bar/"));
|
| ResourceRequestInfoImpl::ForRequest(request.get())
|
| @@ -308,7 +303,7 @@ TEST_P(LinkHeaderServiceWorkerTestP, InstallServiceWorker_InsecureContext) {
|
| ASSERT_EQ(0u, registrations.size());
|
| }
|
|
|
| -TEST_P(LinkHeaderServiceWorkerTestP,
|
| +TEST_F(LinkHeaderServiceWorkerTest,
|
| InstallServiceWorker_NavigationFromInsecureContextToSecureContext) {
|
| std::unique_ptr<net::URLRequest> request = CreateRequest(
|
| GURL("https://example.com/foo/bar/"), RESOURCE_TYPE_MAIN_FRAME);
|
| @@ -329,7 +324,7 @@ TEST_P(LinkHeaderServiceWorkerTestP,
|
| registrations[0].active_version.script_url);
|
| }
|
|
|
| -TEST_P(LinkHeaderServiceWorkerTestP,
|
| +TEST_F(LinkHeaderServiceWorkerTest,
|
| InstallServiceWorker_NavigationToInsecureContext) {
|
| provider_host()->SetDocumentUrl(GURL("http://example.com/foo/bar/"));
|
| provider_host()->set_parent_frame_secure(true);
|
| @@ -344,7 +339,7 @@ TEST_P(LinkHeaderServiceWorkerTestP,
|
| ASSERT_EQ(0u, registrations.size());
|
| }
|
|
|
| -TEST_P(LinkHeaderServiceWorkerTestP,
|
| +TEST_F(LinkHeaderServiceWorkerTest,
|
| InstallServiceWorker_NavigationToInsecureHttpsContext) {
|
| provider_host()->SetDocumentUrl(GURL("https://example.com/foo/bar/"));
|
| provider_host()->set_parent_frame_secure(false);
|
| @@ -359,7 +354,7 @@ TEST_P(LinkHeaderServiceWorkerTestP,
|
| ASSERT_EQ(0u, registrations.size());
|
| }
|
|
|
| -TEST_P(LinkHeaderServiceWorkerTestP,
|
| +TEST_F(LinkHeaderServiceWorkerTest,
|
| InstallServiceWorker_FromWorkerWithoutControllees) {
|
| CreateServiceWorkerProviderHost();
|
| ProcessLinkHeaderForRequest(
|
| @@ -371,7 +366,7 @@ TEST_P(LinkHeaderServiceWorkerTestP,
|
| ASSERT_EQ(0u, registrations.size());
|
| }
|
|
|
| -TEST_P(LinkHeaderServiceWorkerTestP,
|
| +TEST_F(LinkHeaderServiceWorkerTest,
|
| InstallServiceWorker_FromWorkerWithControllees) {
|
| CreateServiceWorkerProviderHost();
|
|
|
| @@ -392,8 +387,4 @@ TEST_P(LinkHeaderServiceWorkerTestP,
|
| ASSERT_EQ(1u, registrations.size());
|
| }
|
|
|
| -INSTANTIATE_TEST_CASE_P(LinkHeaderServiceWorkerTest,
|
| - LinkHeaderServiceWorkerTestP,
|
| - testing::Bool());
|
| -
|
| } // namespace content
|
|
|