Revert of Use the serviceworker with mojo by default

content/browser/service_worker/embedded_worker_instance_unittest.cc

Index: content/browser/service_worker/embedded_worker_instance_unittest.cc
diff --git a/content/browser/service_worker/embedded_worker_instance_unittest.cc b/content/browser/service_worker/embedded_worker_instance_unittest.cc
index 1ded6ee740fbf9e4d2a1c41773e6016a81c18f38..08fa4dd6780bf3749f2650c851553dad65f78908 100644
--- a/content/browser/service_worker/embedded_worker_instance_unittest.cc
+++ b/content/browser/service_worker/embedded_worker_instance_unittest.cc
@@ -17,7 +17,6 @@
 #include "content/browser/service_worker/embedded_worker_test_helper.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
-#include "content/browser/service_worker/service_worker_test_utils.h"
 #include "content/common/service_worker/embedded_worker.mojom.h"
 #include "content/common/service_worker/embedded_worker_messages.h"
 #include "content/common/service_worker/embedded_worker_start_params.h"
@@ -136,8 +135,23 @@
   DISALLOW_COPY_AND_ASSIGN(EmbeddedWorkerInstanceTest);
 };
 
-class EmbeddedWorkerInstanceTestP
-    : public MojoServiceWorkerTestP<EmbeddedWorkerInstanceTest> {};
+class EmbeddedWorkerInstanceTestP : public EmbeddedWorkerInstanceTest,
+                                    public testing::WithParamInterface<bool> {
+ protected:
+  void SetUp() override {
+    is_mojo_enabled_ = GetParam();
+    if (is_mojo_enabled()) {
+      base::CommandLine::ForCurrentProcess()->AppendSwitch(
+          switches::kMojoServiceWorker);
+    }
+    EmbeddedWorkerInstanceTest::SetUp();
+  }
+
+  bool is_mojo_enabled() { return is_mojo_enabled_; }
+
+ private:
+  bool is_mojo_enabled_ = false;
+};
 
 // A helper to simulate the start worker sequence is stalled in a worker
 // process.