| Index: content/browser/service_worker/service_worker_read_from_cache_job_unittest.cc
|
| diff --git a/content/browser/service_worker/service_worker_read_from_cache_job_unittest.cc b/content/browser/service_worker/service_worker_read_from_cache_job_unittest.cc
|
| index 852c7a27e32c77e407c93b9d07a977eecdd8bfde..b0fb55ef0e7400a2f3b650513e9317e9e8cf1356 100644
|
| --- a/content/browser/service_worker/service_worker_read_from_cache_job_unittest.cc
|
| +++ b/content/browser/service_worker/service_worker_read_from_cache_job_unittest.cc
|
| @@ -189,10 +189,7 @@ class ServiceWorkerReadFromCacheJobTest : public testing::Test {
|
| MockURLRequestDelegate delegate_;
|
| };
|
|
|
| -class ServiceWorkerReadFromCacheJobTestP
|
| - : public MojoServiceWorkerTestP<ServiceWorkerReadFromCacheJobTest> {};
|
| -
|
| -TEST_P(ServiceWorkerReadFromCacheJobTestP, ReadMainScript) {
|
| +TEST_F(ServiceWorkerReadFromCacheJobTest, ReadMainScript) {
|
| // Read the main script from the diskcache.
|
| std::unique_ptr<net::URLRequest> request =
|
| url_request_context_->CreateRequest(main_script_.url,
|
| @@ -210,7 +207,7 @@ TEST_P(ServiceWorkerReadFromCacheJobTestP, ReadMainScript) {
|
| DeduceStartWorkerFailureReason(SERVICE_WORKER_OK));
|
| }
|
|
|
| -TEST_P(ServiceWorkerReadFromCacheJobTestP, ReadImportedScript) {
|
| +TEST_F(ServiceWorkerReadFromCacheJobTest, ReadImportedScript) {
|
| // Read the imported script from the diskcache.
|
| std::unique_ptr<net::URLRequest> request =
|
| url_request_context_->CreateRequest(imported_script_.url,
|
| @@ -227,7 +224,7 @@ TEST_P(ServiceWorkerReadFromCacheJobTestP, ReadImportedScript) {
|
| DeduceStartWorkerFailureReason(SERVICE_WORKER_OK));
|
| }
|
|
|
| -TEST_P(ServiceWorkerReadFromCacheJobTestP, ResourceNotFound) {
|
| +TEST_F(ServiceWorkerReadFromCacheJobTest, ResourceNotFound) {
|
| ASSERT_EQ(SERVICE_WORKER_OK, FindRegistration());
|
|
|
| // Try to read a nonexistent resource from the diskcache.
|
| @@ -253,8 +250,4 @@ TEST_P(ServiceWorkerReadFromCacheJobTestP, ResourceNotFound) {
|
| EXPECT_EQ(SERVICE_WORKER_ERROR_NOT_FOUND, FindRegistration());
|
| }
|
|
|
| -INSTANTIATE_TEST_CASE_P(ServiceWorkerReadFromCacheJobTest,
|
| - ServiceWorkerReadFromCacheJobTestP,
|
| - testing::Bool());
|
| -
|
| } // namespace content
|
|
|