Mojofy unittests related to service workers

content/browser/service_worker/service_worker_url_request_job_unittest.cc

Index: content/browser/service_worker/service_worker_url_request_job_unittest.cc
diff --git a/content/browser/service_worker/service_worker_url_request_job_unittest.cc b/content/browser/service_worker/service_worker_url_request_job_unittest.cc
index 1bbbe28bb47e97ddaf4e9b6cc524753236bd17d3..c2168e041c34179d3df7d25bbb07084a7f2ae634 100644
--- a/content/browser/service_worker/service_worker_url_request_job_unittest.cc
+++ b/content/browser/service_worker/service_worker_url_request_job_unittest.cc
@@ -59,8 +59,6 @@
 
 namespace content {
 
-class ServiceWorkerURLRequestJobTest;
-
 namespace {
 
 const int kProviderID = 100;
@@ -338,7 +336,10 @@ class ServiceWorkerURLRequestJobTest
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerURLRequestJobTest);
 };
 
-TEST_F(ServiceWorkerURLRequestJobTest, Simple) {
+class ServiceWorkerURLRequestJobTestP
+    : public MojoServiceWorkerTestP<ServiceWorkerURLRequestJobTest> {};
+
+TEST_P(ServiceWorkerURLRequestJobTestP, Simple) {
   version_->SetStatus(ServiceWorkerVersion::ACTIVATED);
   TestRequest(200, "OK", std::string(), true /* expect_valid_ssl */);
 
@@ -387,7 +388,7 @@ class ProviderDeleteHelper : public EmbeddedWorkerTestHelper {
   DISALLOW_COPY_AND_ASSIGN(ProviderDeleteHelper);
 };
 
-TEST_F(ServiceWorkerURLRequestJobTest, DeletedProviderHostOnFetchEvent) {
+TEST_P(ServiceWorkerURLRequestJobTestP, DeletedProviderHostOnFetchEvent) {
   version_->SetStatus(ServiceWorkerVersion::ACTIVATED);
   // Shouldn't crash if the ProviderHost is deleted prior to completion of
   // the fetch event.
@@ -410,7 +411,7 @@ TEST_F(ServiceWorkerURLRequestJobTest, DeletedProviderHostOnFetchEvent) {
   EXPECT_FALSE(info->service_worker_ready_time().is_null());
 }
 
-TEST_F(ServiceWorkerURLRequestJobTest, DeletedProviderHostBeforeFetchEvent) {
+TEST_P(ServiceWorkerURLRequestJobTestP, DeletedProviderHostBeforeFetchEvent) {
   version_->SetStatus(ServiceWorkerVersion::ACTIVATED);
   request_ = url_request_context_.CreateRequest(
       GURL("https://example.com/foo.html"), net::DEFAULT_PRIORITY,
@@ -473,7 +474,7 @@ class BlobResponder : public EmbeddedWorkerTestHelper {
   DISALLOW_COPY_AND_ASSIGN(BlobResponder);
 };
 
-TEST_F(ServiceWorkerURLRequestJobTest, BlobResponse) {
+TEST_P(ServiceWorkerURLRequestJobTestP, BlobResponse) {
   ChromeBlobStorageContext* blob_storage_context =
       ChromeBlobStorageContext::GetFor(browser_context_.get());
   std::string expected_response;
@@ -503,7 +504,7 @@ TEST_F(ServiceWorkerURLRequestJobTest, BlobResponse) {
   EXPECT_FALSE(info->service_worker_ready_time().is_null());
 }
 
-TEST_F(ServiceWorkerURLRequestJobTest, NonExistentBlobUUIDResponse) {
+TEST_P(ServiceWorkerURLRequestJobTestP, NonExistentBlobUUIDResponse) {
   SetUpWithHelper(new BlobResponder("blob-id:nothing-is-here", 0));
   version_->SetStatus(ServiceWorkerVersion::ACTIVATED);
   TestRequest(500, "Service Worker Response Error", std::string(),
@@ -555,7 +556,7 @@ class StreamResponder : public EmbeddedWorkerTestHelper {
   DISALLOW_COPY_AND_ASSIGN(StreamResponder);
 };
 
-TEST_F(ServiceWorkerURLRequestJobTest, StreamResponse) {
+TEST_P(ServiceWorkerURLRequestJobTestP, StreamResponse) {
   const GURL stream_url("blob://stream");
   StreamContext* stream_context =
       GetStreamContextForResourceContext(
@@ -604,7 +605,7 @@ TEST_F(ServiceWorkerURLRequestJobTest, StreamResponse) {
   EXPECT_FALSE(HasWork());
 }
 
-TEST_F(ServiceWorkerURLRequestJobTest, StreamResponse_DelayedRegistration) {
+TEST_P(ServiceWorkerURLRequestJobTestP, StreamResponse_DelayedRegistration) {
   const GURL stream_url("blob://stream");
   StreamContext* stream_context =
       GetStreamContextForResourceContext(
@@ -654,8 +655,7 @@ TEST_F(ServiceWorkerURLRequestJobTest, StreamResponse_DelayedRegistration) {
   EXPECT_FALSE(HasWork());
 }
 
-
-TEST_F(ServiceWorkerURLRequestJobTest, StreamResponse_QuickFinalize) {
+TEST_P(ServiceWorkerURLRequestJobTestP, StreamResponse_QuickFinalize) {
   const GURL stream_url("blob://stream");
   StreamContext* stream_context =
       GetStreamContextForResourceContext(
@@ -703,7 +703,7 @@ TEST_F(ServiceWorkerURLRequestJobTest, StreamResponse_QuickFinalize) {
   EXPECT_FALSE(HasWork());
 }
 
-TEST_F(ServiceWorkerURLRequestJobTest, StreamResponse_Flush) {
+TEST_P(ServiceWorkerURLRequestJobTestP, StreamResponse_Flush) {
   const GURL stream_url("blob://stream");
   StreamContext* stream_context =
       GetStreamContextForResourceContext(
@@ -749,7 +749,7 @@ TEST_F(ServiceWorkerURLRequestJobTest, StreamResponse_Flush) {
   EXPECT_FALSE(info->service_worker_ready_time().is_null());
 }
 
-TEST_F(ServiceWorkerURLRequestJobTest, StreamResponseAndCancel) {
+TEST_P(ServiceWorkerURLRequestJobTestP, StreamResponseAndCancel) {
   const GURL stream_url("blob://stream");
   StreamContext* stream_context =
       GetStreamContextForResourceContext(
@@ -802,7 +802,7 @@ TEST_F(ServiceWorkerURLRequestJobTest, StreamResponseAndCancel) {
   EXPECT_FALSE(info->service_worker_ready_time().is_null());
 }
 
-TEST_F(ServiceWorkerURLRequestJobTest,
+TEST_P(ServiceWorkerURLRequestJobTestP,
        StreamResponse_DelayedRegistrationAndCancel) {
   const GURL stream_url("blob://stream");
   StreamContext* stream_context =
@@ -857,7 +857,7 @@ class FailFetchHelper : public EmbeddedWorkerTestHelper {
   DISALLOW_COPY_AND_ASSIGN(FailFetchHelper);
 };
 
-TEST_F(ServiceWorkerURLRequestJobTest, FailFetchDispatch) {
+TEST_P(ServiceWorkerURLRequestJobTestP, FailFetchDispatch) {
   SetUpWithHelper(new FailFetchHelper);
 
   version_->SetStatus(ServiceWorkerVersion::ACTIVATED);
@@ -887,7 +887,7 @@ TEST_F(ServiceWorkerURLRequestJobTest, FailFetchDispatch) {
 }
 
 // TODO(horo): Remove this test when crbug.com/485900 is fixed.
-TEST_F(ServiceWorkerURLRequestJobTest, MainScriptHTTPResponseInfoNotSet) {
+TEST_P(ServiceWorkerURLRequestJobTestP, MainScriptHTTPResponseInfoNotSet) {
   // Shouldn't crash if MainScriptHttpResponseInfo is not set.
   SetUpWithHelper(new EmbeddedWorkerTestHelper(base::FilePath()), false);
   version_->SetStatus(ServiceWorkerVersion::ACTIVATED);
@@ -914,7 +914,7 @@ TEST_F(ServiceWorkerURLRequestJobTest, MainScriptHTTPResponseInfoNotSet) {
   EXPECT_FALSE(info->service_worker_ready_time().is_null());
 }
 
-TEST_F(ServiceWorkerURLRequestJobTest, FailToActivate_MainResource) {
+TEST_P(ServiceWorkerURLRequestJobTestP, FailToActivate_MainResource) {
   RunFailToActivateTest(RESOURCE_TYPE_MAIN_FRAME);
 
   // The load should fail and we should have fallen back to network because
@@ -930,7 +930,7 @@ TEST_F(ServiceWorkerURLRequestJobTest, FailToActivate_MainResource) {
   EXPECT_EQ(host->controlling_version(), nullptr);
 }
 
-TEST_F(ServiceWorkerURLRequestJobTest, FailToActivate_Subresource) {
+TEST_P(ServiceWorkerURLRequestJobTestP, FailToActivate_Subresource) {
   RunFailToActivateTest(RESOURCE_TYPE_IMAGE);
 
   // The load should fail and we should not fall back to network because
@@ -983,7 +983,7 @@ class EarlyResponseHelper : public EmbeddedWorkerTestHelper {
 
 // This simulates the case when a response is returned and the fetch event is
 // still in flight.
-TEST_F(ServiceWorkerURLRequestJobTest, EarlyResponse) {
+TEST_P(ServiceWorkerURLRequestJobTestP, EarlyResponse) {
   EarlyResponseHelper* helper = new EarlyResponseHelper;
   SetUpWithHelper(helper);
 
@@ -1050,7 +1050,7 @@ class DelayedResponseHelper : public EmbeddedWorkerTestHelper {
 };
 
 // Test cancelling the URLRequest while the fetch event is in flight.
-TEST_F(ServiceWorkerURLRequestJobTest, CancelRequest) {
+TEST_P(ServiceWorkerURLRequestJobTestP, CancelRequest) {
   DelayedResponseHelper* helper = new DelayedResponseHelper;
   SetUpWithHelper(helper);
 
@@ -1080,4 +1080,8 @@ TEST_F(ServiceWorkerURLRequestJobTest, CancelRequest) {
 // TODO(kinuko): Add more tests with different response data and also for
 // FallbackToNetwork case.
 
+INSTANTIATE_TEST_CASE_P(ServiceWorkerURLRequestJobTest,
+                        ServiceWorkerURLRequestJobTestP,
+                        testing::Bool());
+
 }  // namespace content