ServiceWorker: Returns true for IsMojoForServiceWorkerEnabled

content/browser/service_worker/service_worker_provider_host_unittest.cc

Index: content/browser/service_worker/service_worker_provider_host_unittest.cc
diff --git a/content/browser/service_worker/service_worker_provider_host_unittest.cc b/content/browser/service_worker/service_worker_provider_host_unittest.cc
index 184d661b6554db35c038e4c430e6c6a402483897..799c36da12d1d0bbdf671f0052480ecae715c148 100644
--- a/content/browser/service_worker/service_worker_provider_host_unittest.cc
+++ b/content/browser/service_worker/service_worker_provider_host_unittest.cc
@@ -102,10 +102,7 @@ class ServiceWorkerProviderHostTest : public testing::Test {
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerProviderHostTest);
 };
 
-class ServiceWorkerProviderHostTestP
-    : public MojoServiceWorkerTestP<ServiceWorkerProviderHostTest> {};
-
-TEST_P(ServiceWorkerProviderHostTestP, PotentialRegistration_ProcessStatus) {
+TEST_F(ServiceWorkerProviderHostTest, PotentialRegistration_ProcessStatus) {
   // Matching registrations have already been set by SetDocumentUrl.
   ASSERT_TRUE(PatternHasProcessToRun(registration1_->pattern()));
 
@@ -134,7 +131,7 @@ TEST_P(ServiceWorkerProviderHostTestP, PotentialRegistration_ProcessStatus) {
   ASSERT_TRUE(PatternHasProcessToRun(registration3_->pattern()));   // host1,2
 }
 
-TEST_P(ServiceWorkerProviderHostTestP, AssociatedRegistration_ProcessStatus) {
+TEST_F(ServiceWorkerProviderHostTest, AssociatedRegistration_ProcessStatus) {
   // Associating the registration will also increase the process refs for
   // the registration's pattern.
   provider_host1_->AssociateRegistration(registration1_.get(),
@@ -147,7 +144,7 @@ TEST_P(ServiceWorkerProviderHostTestP, AssociatedRegistration_ProcessStatus) {
   ASSERT_TRUE(PatternHasProcessToRun(registration1_->pattern()));
 }
 
-TEST_P(ServiceWorkerProviderHostTestP, MatchRegistration) {
+TEST_F(ServiceWorkerProviderHostTest, MatchRegistration) {
   // Match registration should return the longest matching one.
   ASSERT_EQ(registration2_, provider_host1_->MatchRegistration());
   provider_host1_->RemoveMatchingRegistration(registration2_.get());
@@ -170,7 +167,7 @@ TEST_P(ServiceWorkerProviderHostTestP, MatchRegistration) {
   ASSERT_EQ(nullptr, provider_host1_->MatchRegistration());
 }
 
-TEST_P(ServiceWorkerProviderHostTestP, ContextSecurity) {
+TEST_F(ServiceWorkerProviderHostTest, ContextSecurity) {
   using FrameSecurityLevel = ServiceWorkerProviderHost::FrameSecurityLevel;
   content::ResetSchemesAndOriginsWhitelistForTesting();
 
@@ -203,8 +200,4 @@ TEST_P(ServiceWorkerProviderHostTestP, ContextSecurity) {
   EXPECT_FALSE(provider_host1_->IsContextSecureForServiceWorker());
 }
 
-INSTANTIATE_TEST_CASE_P(ServiceWorkerProviderHostTest,
-                        ServiceWorkerProviderHostTestP,
-                        ::testing::Values(false, true));
-
 }  // namespace content