ServiceWorker: Returns true for IsMojoForServiceWorkerEnabled

content/browser/service_worker/service_worker_registration_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/service_worker/service_worker_registration.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/files/scoped_temp_dir.h"
@@ skipping 81 matching lines @@
     scoped_refptr<ServiceWorkerRegistration> observed_registration_;
     ChangedVersionAttributesMask observed_changed_mask_;
     ServiceWorkerRegistrationInfo observed_info_;
   };
 
  private:
   std::unique_ptr<EmbeddedWorkerTestHelper> helper_;
   TestBrowserThreadBundle thread_bundle_;
 };
 
-class ServiceWorkerRegistrationTestP
-    : public MojoServiceWorkerTestP<ServiceWorkerRegistrationTest> {};
-
-TEST_P(ServiceWorkerRegistrationTestP, SetAndUnsetVersions) {
+TEST_F(ServiceWorkerRegistrationTest, SetAndUnsetVersions) {
   const GURL kScope("http://www.example.not/");
   const GURL kScript("http://www.example.not/service_worker.js");
   int64_t kRegistrationId = 1L;
   scoped_refptr<ServiceWorkerRegistration> registration =
       new ServiceWorkerRegistration(kScope, kRegistrationId,
                                     context()->AsWeakPtr());
 
   const int64_t version_1_id = 1L;
   const int64_t version_2_id = 2L;
   scoped_refptr<ServiceWorkerVersion> version_1 = new ServiceWorkerVersion(
@@ skipping 47 matching lines @@
   EXPECT_FALSE(registration->waiting_version());
   EXPECT_EQ(ChangedVersionAttributesMask::WAITING_VERSION,
             listener.observed_changed_mask_.changed());
   EXPECT_EQ(version_1_id, listener.observed_info_.active_version.version_id);
   EXPECT_EQ(listener.observed_info_.waiting_version.version_id,
             kInvalidServiceWorkerVersionId);
   EXPECT_EQ(listener.observed_info_.installing_version.version_id,
             kInvalidServiceWorkerVersionId);
 }
 
-TEST_P(ServiceWorkerRegistrationTestP, FailedRegistrationNoCrash) {
+TEST_F(ServiceWorkerRegistrationTest, FailedRegistrationNoCrash) {
   const GURL kScope("http://www.example.not/");
   int64_t kRegistrationId = 1L;
   scoped_refptr<ServiceWorkerRegistration> registration =
       new ServiceWorkerRegistration(kScope, kRegistrationId,
                                     context()->AsWeakPtr());
   std::unique_ptr<ServiceWorkerRegistrationHandle> handle(
       new ServiceWorkerRegistrationHandle(
           context()->AsWeakPtr(), base::WeakPtr<ServiceWorkerProviderHost>(),
           registration.get()));
   registration->NotifyRegistrationFailed();
   // Don't crash when handle gets destructed.
 }
 
-TEST_P(ServiceWorkerRegistrationTestP, NavigationPreload) {
+TEST_F(ServiceWorkerRegistrationTest, NavigationPreload) {
   const GURL kScope("http://www.example.not/");
   const GURL kScript("https://www.example.not/service_worker.js");
   // Setup.
   scoped_refptr<ServiceWorkerRegistration> registration =
       new ServiceWorkerRegistration(kScope, storage()->NewRegistrationId(),
                                     context()->AsWeakPtr());
   scoped_refptr<ServiceWorkerVersion> version_1 = new ServiceWorkerVersion(
       registration.get(), kScript, storage()->NewVersionId(),
       context()->AsWeakPtr());
   version_1->set_fetch_handler_existence(
@@ skipping 17 matching lines @@
   registration->SetActiveVersion(version_2);
   version_2->SetStatus(ServiceWorkerVersion::ACTIVATING);
   EXPECT_TRUE(version_2->navigation_preload_state().enabled);
   // Disabling it unsets the flag on the active version.
   registration->EnableNavigationPreload(false);
   EXPECT_FALSE(version_2->navigation_preload_state().enabled);
 }
 
 // Sets up a registration with a waiting worker, and an active worker
 // with a controllee and an inflight request.
-class ServiceWorkerActivationTest : public ServiceWorkerRegistrationTestP {
+class ServiceWorkerActivationTest : public ServiceWorkerRegistrationTest {
  public:
-  ServiceWorkerActivationTest() : ServiceWorkerRegistrationTestP() {}
+  ServiceWorkerActivationTest() : ServiceWorkerRegistrationTest() {}
 
   void SetUp() override {
     ServiceWorkerRegistrationTest::SetUp();
 
     const GURL kScope("https://www.example.not/");
     const GURL kScript("https://www.example.not/service_worker.js");
 
     registration_ = new ServiceWorkerRegistration(
         kScope, storage()->NewRegistrationId(), context()->AsWeakPtr());
 
@@ skipping 57 matching lines @@
   ServiceWorkerProviderHost* controllee() { return host_.get(); }
   int inflight_request_id() const { return inflight_request_id_; }
 
  private:
   scoped_refptr<ServiceWorkerRegistration> registration_;
   std::unique_ptr<ServiceWorkerProviderHost> host_;
   int inflight_request_id_ = -1;
 };
 
 // Test activation triggered by finishing all requests.
-TEST_P(ServiceWorkerActivationTest, NoInflightRequest) {
+TEST_F(ServiceWorkerActivationTest, NoInflightRequest) {
   scoped_refptr<ServiceWorkerRegistration> reg = registration();
   scoped_refptr<ServiceWorkerVersion> version_1 = reg->active_version();
   scoped_refptr<ServiceWorkerVersion> version_2 = reg->waiting_version();
 
   // Remove the controllee. Since there is an in-flight request,
   // activation should not yet happen.
   version_1->RemoveControllee(controllee());
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(version_1.get(), reg->active_version());
 
   // Finish the request. Activation should happen.
   version_1->FinishRequest(inflight_request_id(), true /* was_handled */,
                            base::Time::Now());
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(version_2.get(), reg->active_version());
 }
 
 // Test activation triggered by loss of controllee.
-TEST_P(ServiceWorkerActivationTest, NoControllee) {
+TEST_F(ServiceWorkerActivationTest, NoControllee) {
   scoped_refptr<ServiceWorkerRegistration> reg = registration();
   scoped_refptr<ServiceWorkerVersion> version_1 = reg->active_version();
   scoped_refptr<ServiceWorkerVersion> version_2 = reg->waiting_version();
 
   // Finish the request. Since there is a controllee, activation should not yet
   // happen.
   version_1->FinishRequest(inflight_request_id(), true /* was_handled */,
                            base::Time::Now());
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(version_1.get(), reg->active_version());
 
   // Remove the controllee. Activation should happen.
   version_1->RemoveControllee(controllee());
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(version_2.get(), reg->active_version());
 }
 
 // Test activation triggered by skipWaiting.
-TEST_P(ServiceWorkerActivationTest, SkipWaiting) {
+TEST_F(ServiceWorkerActivationTest, SkipWaiting) {
   scoped_refptr<ServiceWorkerRegistration> reg = registration();
   scoped_refptr<ServiceWorkerVersion> version_1 = reg->active_version();
   scoped_refptr<ServiceWorkerVersion> version_2 = reg->waiting_version();
 
   // Finish the in-flight request. Since there is a controllee,
   // activation should not happen.
   version_1->FinishRequest(inflight_request_id(), true /* was_handled */,
                            base::Time::Now());
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(version_1.get(), reg->active_version());
 
   // Call skipWaiting. Activation should happen.
   version_2->OnSkipWaiting(77 /* dummy request_id */);
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(version_2.get(), reg->active_version());
 }
 
 // Test activation triggered by skipWaiting and finishing requests.
-TEST_P(ServiceWorkerActivationTest, SkipWaitingWithInflightRequest) {
+TEST_F(ServiceWorkerActivationTest, SkipWaitingWithInflightRequest) {
   scoped_refptr<ServiceWorkerRegistration> reg = registration();
   scoped_refptr<ServiceWorkerVersion> version_1 = reg->active_version();
   scoped_refptr<ServiceWorkerVersion> version_2 = reg->waiting_version();
 
   // Set skip waiting flag. Since there is still an in-flight request,
   // activation should not happen.
   version_2->OnSkipWaiting(77 /* dummy request_id */);
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(version_1.get(), reg->active_version());
 
   // Finish the request. Activation should happen.
   version_1->FinishRequest(inflight_request_id(), true /* was_handled */,
                            base::Time::Now());
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(version_2.get(), reg->active_version());
 }
 
-INSTANTIATE_TEST_CASE_P(ServiceWorkerRegistrationTest,
-                        ServiceWorkerRegistrationTestP,
-                        testing::Bool());
-
-INSTANTIATE_TEST_CASE_P(ServiceWorkerActivationTest,
-                        ServiceWorkerActivationTest,
-                        testing::Bool());
-
 }  // namespace content