[ThreadPool]: Cleanup kMergeBlockingNonBlockingPools.

This feature has shipped and was enabled by default. Change-Id: Ib91e8aa0e76aa0fd6f30ef313a7674e5992abd35 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1907129 Reviewed-by: François Doray <fdoray@chromium.org> Reviewed-by: Kentaro Hara <haraken@chromium.org> Reviewed-by: Gabriel Charette <gab@chromium.org> Commit-Queue: Etienne Pierre-Doray <etiennep@chromium.org> Cr-Commit-Position: refs/heads/master@{#717057}
marcosholgado · Nov 20, 2019 · 61534ec · 61534ec
1 parent 5d98cbb
commit 61534ec
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 18 deletions.
diff --git a/base/task/task_features.cc b/base/task/task_features.cc
@@ -11,12 +11,6 @@ namespace base {
 const Feature kAllTasksUserBlocking{"AllTasksUserBlocking",
                                     FEATURE_DISABLED_BY_DEFAULT};
 
-// This experiment no longer has any impact, but remains enabled by default
-// because script streamer depends on it.
-// TODO(etiennep): Cleanup this experiment.
-const Feature kMergeBlockingNonBlockingPools = {
-    "MergeBlockingNonBlockingPools", base::FEATURE_ENABLED_BY_DEFAULT};
-
 const Feature kNoDetachBelowInitialCapacity = {
     "NoDetachBelowInitialCapacity", base::FEATURE_DISABLED_BY_DEFAULT};
 

diff --git a/base/task/task_features.h b/base/task/task_features.h
@@ -14,7 +14,6 @@ namespace base {
 struct Feature;
 
 extern const BASE_EXPORT Feature kAllTasksUserBlocking;
-extern const BASE_EXPORT Feature kMergeBlockingNonBlockingPools;
 
 // Under this feature, unused threads in ThreadGroup are only detached
 // if the total number of threads in the pool is above the initial capacity.

diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
@@ -11,7 +11,6 @@
 #include "base/metrics/field_trial.h"
 #include "base/metrics/field_trial_params.h"
 #include "base/strings/string_util.h"
-#include "base/task/task_features.h"
 #include "build/build_config.h"
 #include "content/common/content_switches_internal.h"
 #include "content/public/common/content_features.h"
@@ -232,8 +231,6 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
            features::kAllowActivationDelegationAttr, kUseFeatureState},
           {wf::EnableScriptStreamingOnPreload,
            features::kScriptStreamingOnPreload, kUseFeatureState},
-          {wf::EnableMergeBlockingNonBlockingPools,
-           base::kMergeBlockingNonBlockingPools, kUseFeatureState},
           {wf::EnableLazyFrameLoading, features::kLazyFrameLoading,
            kUseFeatureState},
           {wf::EnableLazyFrameVisibleLoadTimeMetrics,

diff --git a/third_party/blink/public/platform/web_runtime_features.h b/third_party/blink/public/platform/web_runtime_features.h
@@ -224,7 +224,6 @@ class WebRuntimeFeatures {
   BLINK_PLATFORM_EXPORT static void EnableAutoplayIgnoresWebAudio(bool);
   BLINK_PLATFORM_EXPORT static void EnableMediaControlsExpandGesture(bool);
   BLINK_PLATFORM_EXPORT static void EnableTranslateService(bool);
-  BLINK_PLATFORM_EXPORT static void EnableMergeBlockingNonBlockingPools(bool);
   BLINK_PLATFORM_EXPORT static void EnableGetDisplayMedia(bool);
   BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool);
   BLINK_PLATFORM_EXPORT static void EnableShadowDOMV0(bool);

diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.cc b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
@@ -622,10 +622,6 @@ void WebRuntimeFeatures::EnableBackgroundFetch(bool enable) {
   RuntimeEnabledFeatures::SetBackgroundFetchEnabled(enable);
 }
 
-void WebRuntimeFeatures::EnableMergeBlockingNonBlockingPools(bool enable) {
-  RuntimeEnabledFeatures::SetMergeBlockingNonBlockingPoolsEnabled(enable);
-}
-
 void WebRuntimeFeatures::EnableGetDisplayMedia(bool enable) {
   RuntimeEnabledFeatures::SetGetDisplayMediaEnabled(enable);
 }

diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1020,9 +1020,6 @@
       name: "MediaSourceStable",
       status: "stable",
     },
-    {
-      name: "MergeBlockingNonBlockingPools",
-    },
     // Support for META tag for setting color-scheme used for opting into dark
     // UA theming and opting out of forced dark mode.
     // https://drafts.csswg.org/css-color-adjust/#color-scheme-meta