ServiceWorker: Returns true for IsMojoForServiceWorkerEnabled

content/browser/service_worker/service_worker_handle_unittest.cc

 // Copyright 2014 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 <tuple>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "content/browser/service_worker/embedded_worker_registry.h"
@@ skipping 125 matching lines @@
   std::unique_ptr<EmbeddedWorkerTestHelper> helper_;
   std::unique_ptr<ServiceWorkerProviderHost> provider_host_;
   scoped_refptr<ServiceWorkerRegistration> registration_;
   scoped_refptr<ServiceWorkerVersion> version_;
   scoped_refptr<TestingServiceWorkerDispatcherHost> dispatcher_host_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerHandleTest);
 };
 
-class ServiceWorkerHandleTestP
-    : public MojoServiceWorkerTestP<ServiceWorkerHandleTest> {};
-
-TEST_P(ServiceWorkerHandleTestP, OnVersionStateChanged) {
+TEST_F(ServiceWorkerHandleTest, OnVersionStateChanged) {
   std::unique_ptr<ServiceWorkerHandle> handle =
       ServiceWorkerHandle::Create(helper_->context()->AsWeakPtr(),
                                   provider_host_->AsWeakPtr(), version_.get());
 
   // Start the worker, and then...
   ServiceWorkerStatusCode status = SERVICE_WORKER_ERROR_FAILED;
   version_->StartWorker(ServiceWorkerMetrics::EventType::UNKNOWN,
                         CreateReceiverOnCurrentThread(&status));
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(SERVICE_WORKER_OK, status);
 
   // ...update state to installed.
   version_->SetStatus(ServiceWorkerVersion::INSTALLED);
 
   ASSERT_EQ(0L, dispatcher_host_->bad_message_received_count_);
 
   const IPC::Message* message = nullptr;
-  if (is_mojo_enabled()) {
-    // StartWorker shouldn't be recorded here.
-    ASSERT_EQ(1UL, ipc_sink()->message_count());
-    message = ipc_sink()->GetMessageAt(0);
-  } else {
-    ASSERT_EQ(2UL, ipc_sink()->message_count());
-    // We should be sending 1. StartWorker,
-    EXPECT_EQ(EmbeddedWorkerMsg_StartWorker::ID,
-              ipc_sink()->GetMessageAt(0)->type());
-    message = ipc_sink()->GetMessageAt(1);
-  }
+  // StartWorker shouldn't be recorded here.
+  ASSERT_EQ(1UL, ipc_sink()->message_count());
+  message = ipc_sink()->GetMessageAt(0);
+
   // StateChanged (state == Installed).
   VerifyStateChangedMessage(handle->handle_id(),
                             blink::WebServiceWorkerStateInstalled, message);
 }
 
-INSTANTIATE_TEST_CASE_P(ServiceWorkerHandleTest,
-                        ServiceWorkerHandleTestP,
-                        ::testing::Values(false, true));
-
 }  // namespace content