| Index: content/browser/service_worker/service_worker_browsertest.cc
|
| diff --git a/content/browser/service_worker/service_worker_browsertest.cc b/content/browser/service_worker/service_worker_browsertest.cc
|
| index 81b4ffce99d49bcc581f3a515d16bdd669c0cd40..ad010fc603dc5a3df4d1706f9e79a7afb6e5d899 100644
|
| --- a/content/browser/service_worker/service_worker_browsertest.cc
|
| +++ b/content/browser/service_worker/service_worker_browsertest.cc
|
| @@ -336,20 +336,11 @@ void CountScriptResources(
|
|
|
| } // namespace
|
|
|
| -class ServiceWorkerBrowserTest : public testing::WithParamInterface<bool>,
|
| - public ContentBrowserTest {
|
| +class ServiceWorkerBrowserTest
|
| + : public MojoServiceWorkerTestP<ContentBrowserTest> {
|
| protected:
|
| using self = ServiceWorkerBrowserTest;
|
|
|
| - void SetUp() override {
|
| - is_mojo_enabled_ = GetParam();
|
| - if (is_mojo_enabled()) {
|
| - base::CommandLine::ForCurrentProcess()->AppendSwitch(
|
| - switches::kMojoServiceWorker);
|
| - }
|
| - ContentBrowserTest::SetUp();
|
| - }
|
| -
|
| void SetUpOnMainThread() override {
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
| StoragePartition* partition = BrowserContext::GetDefaultStoragePartition(
|
| @@ -377,7 +368,6 @@ class ServiceWorkerBrowserTest : public testing::WithParamInterface<bool>,
|
|
|
| ServiceWorkerContextWrapper* wrapper() { return wrapper_.get(); }
|
| ServiceWorkerContext* public_context() { return wrapper(); }
|
| - bool is_mojo_enabled() const { return is_mojo_enabled_; }
|
|
|
| void AssociateRendererProcessToPattern(const GURL& pattern) {
|
| wrapper_->process_manager()->AddProcessReferenceToPattern(
|
| @@ -386,7 +376,6 @@ class ServiceWorkerBrowserTest : public testing::WithParamInterface<bool>,
|
|
|
| private:
|
| scoped_refptr<ServiceWorkerContextWrapper> wrapper_;
|
| - bool is_mojo_enabled_ = false;
|
| };
|
|
|
| class ConsoleListener : public EmbeddedWorkerInstance::Listener {
|
|
|