Remove --disable-mojo-service-worker

https://crrev.com/2627543002 removes the non-mojo path. Let's remove the non-mojo tests and the flag to run non-mojo path. BUG=629701 Review-Url: https://codereview.chromium.org/2619883004 Cr-Commit-Position: refs/heads/master@{#443172}
Denger-Network · Jan 12, 2017 · 0d91b4b · 0d91b4b
1 parent a79d034
commit 0d91b4b
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 16 deletions.
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
@@ -1689,7 +1689,6 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
     switches::kDisableLocalStorage,
     switches::kDisableLogging,
     switches::kDisableMediaSuspend,
-    switches::kDisableMojoServiceWorker,
     switches::kDisableNotifications,
     switches::kDisableOverlayScrollbar,
     switches::kDisablePepper3DImageChromium,

diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
@@ -661,9 +661,6 @@ const char kMHTMLSkipNostoreAll[]           = "skip-nostore-all";
 // Use a Mojo-based LocalStorage implementation.
 const char kMojoLocalStorage[]              = "mojo-local-storage";
 
-// Disables a Mojo-based ServiceWorker implementation.
-const char kDisableMojoServiceWorker[]      = "disable-mojo-service-worker";
-
 // Mutes audio sent to the audio device so it is not audible during
 // automated testing.
 const char kMuteAudio[]                     = "mute-audio";

diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
@@ -74,7 +74,6 @@ CONTENT_EXPORT extern const char kDisablePreferCompositingToLCDText[];
 CONTENT_EXPORT extern const char kDisableKillAfterBadIPC[];
 CONTENT_EXPORT extern const char kDisableLocalStorage[];
 CONTENT_EXPORT extern const char kDisableLogging[];
-CONTENT_EXPORT extern const char kDisableMojoServiceWorker[];
 CONTENT_EXPORT extern const char kDisableNamespaceSandbox[];
 CONTENT_EXPORT extern const char kDisableNotifications[];
 CONTENT_EXPORT extern const char kDisablePartialRaster[];

diff --git a/third_party/WebKit/LayoutTests/LeakExpectations b/third_party/WebKit/LayoutTests/LeakExpectations
@@ -96,8 +96,6 @@ crbug.com/506754 http/tests/serviceworker/chromium/resolve-after-window-close.ht
 crbug.com/506754 virtual/mojo-loading/http/tests/serviceworker/chromium/resolve-after-window-close.html [ Leak ]
 crbug.com/506754 http/tests/serviceworker/chromium/window-close-during-registration.html [ Leak ]
 crbug.com/506754 virtual/mojo-loading/http/tests/serviceworker/chromium/window-close-during-registration.html [ Leak ]
-crbug.com/506754 virtual/disable-mojo-service-worker/http/tests/serviceworker/chromium/resolve-after-window-close.html [ Leak ]
-crbug.com/506754 virtual/disable-mojo-service-worker/http/tests/serviceworker/chromium/window-close-during-registration.html [ Leak ]
 crbug.com/506754 virtual/service-worker-navigation-preload/http/tests/serviceworker/chromium/resolve-after-window-close.html [ Leak ]
 crbug.com/506754 virtual/service-worker-navigation-preload/http/tests/serviceworker/chromium/window-close-during-registration.html [ Leak ]
 

diff --git a/third_party/WebKit/LayoutTests/SlowTests b/third_party/WebKit/LayoutTests/SlowTests
@@ -395,10 +395,8 @@ crbug.com/671158 [ Linux ] virtual/mojo-loading/http/tests/streams/writable-stre
 
 # Usually plenty fast, but sometimes very slow on windows.
 crbug.com/678498 [ Win ] http/tests/serviceworker/foreign-fetch-cors.html [ Slow ]
-crbug.com/678498 [ Win ] virtual/disable-mojo-service-worker/http/tests/serviceworker/foreign-fetch-cors.html [ Slow ]
 crbug.com/678498 [ Win ] virtual/mojo-loading/http/tests/serviceworker/foreign-fetch-cors.html [ Slow ]
 crbug.com/678498 [ Win ] virtual/service-worker-navigation-preload/http/tests/serviceworker/foreign-fetch-cors.html [ Slow ]
 crbug.com/678496 [ Win ] http/tests/serviceworker/foreign-fetch-basics.html [ Slow ]
-crbug.com/678496 [ Win ] virtual/disable-mojo-service-worker/http/tests/serviceworker/foreign-fetch-basics.html [ Slow ]
 crbug.com/678496 [ Win ] virtual/mojo-loading/http/tests/serviceworker/foreign-fetch-basics.html [ Slow ]
 crbug.com/678496 [ Win ] virtual/service-worker-navigation-preload/http/tests/serviceworker/foreign-fetch-basics.html [ Slow ]
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations
@@ -619,7 +619,6 @@ crbug.com/635619 virtual/layout_ng/fast/block/float/avoid-floats-when-negative-m
 # Requires ServiceWorkerNavigationPreload feature enabled. Run under
 # virtual/service-worker-navigation-preload only.
 crbug.com/649558 http/tests/serviceworker/navigation-preload/ [ Skip ]
-crbug.com/649558 virtual/disable-mojo-service-worker/http/tests/serviceworker/navigation-preload/ [ Skip ]
 crbug.com/649558 virtual/mojo-loading/http/tests/serviceworker/navigation-preload/ [ Skip ]
 
 # Run these tests with under virtual/scalefactor... only.

diff --git a/third_party/WebKit/LayoutTests/VirtualTestSuites b/third_party/WebKit/LayoutTests/VirtualTestSuites
@@ -315,11 +315,6 @@
     "base": "http/tests/asmjs",
     "args": ["--enable-features=AsmJsToWebAssembly"]
   },
-  {
-    "prefix": "disable-mojo-service-worker",
-    "base": "http/tests/serviceworker",
-    "args": ["--disable-mojo-service-worker"]
-  },
   {
     "prefix": "service-worker-navigation-preload",
     "base": "http/tests/serviceworker",

diff --git a/...ebKit/LayoutTests/virtual/disable-mojo-service-worker/http/tests/serviceworker/README.txt b/...ebKit/LayoutTests/virtual/disable-mojo-service-worker/http/tests/serviceworker/README.txt