flags: demote nacl flags to command-line switches

NaCl development has been transitioning to WebAssembly for some time, and
NaCl is deprecated for some use cases.
This change removes these nacl-related flags:

  enable-nacl
  enable-nacl-debug
  force-pnacl-subzero
  nacl-debug-mask
  allow-nacl-socket-api

The corresponding nacl switches are still present; if you are developing using
one of these flags, migrate to using the command-line switch instead. The
force-pnacl-subzero and allow-nacl-socket-api switches are themselves slated to
be removed soon.

Bug: 918376
Change-Id: Ied029b6f8bd001fdacb5f0734bd1c5f4cf3d322a
Reviewed-on: https://chromium-review.googlesource.com/c/1473834
Commit-Queue: Derek Schuff <dschuff@chromium.org>
Reviewed-by: Bill Budge <bbudge@chromium.org>
Reviewed-by: Derek Schuff <dschuff@chromium.org>
Auto-Submit: Elly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#632397}

chrome/browser/about_flags.cc

@@ -66,8 +66,6 @@
 #include "components/flags_ui/flags_ui_switches.h"
 #include "components/invalidation/impl/invalidation_switches.h"
 #include "components/language/core/common/language_experiments.h"
-#include "components/nacl/common/buildflags.h"
-#include "components/nacl/common/nacl_switches.h"
 #include "components/network_session_configurator/common/network_features.h"
 #include "components/network_session_configurator/common/network_switches.h"
 #include "components/ntp_snippets/contextual/contextual_suggestions_features.h"
@@ -271,22 +269,6 @@ const FeatureEntry::Choice kTraceUploadURL[] = {
     {flag_descriptions::kTraceUploadUrlChoiceTesting, switches::kTraceUploadURL,
      "https://performance-insights.appspot.com/upload?tags=flags,TestingTeam"}};
 
-#if BUILDFLAG(ENABLE_NACL)
-const FeatureEntry::Choice kNaClDebugMaskChoices[] = {
-    // Secure shell can be used on ChromeOS for forwarding the TCP port opened
-    // by
-    // debug stub to a remote machine. Since secure shell uses NaCl, we usually
-    // want to avoid debugging that. The PNaCl translator is also a NaCl module,
-    // so by default we want to avoid debugging that.
-    // NOTE: As the default value must be the empty string, the mask excluding
-    // the PNaCl translator and secure shell is substituted elsewhere.
-    {flag_descriptions::kNaclDebugMaskChoiceExcludeUtilsPnacl, "", ""},
-    {flag_descriptions::kNaclDebugMaskChoiceDebugAll, switches::kNaClDebugMask,
-     "*://*"},
-    {flag_descriptions::kNaclDebugMaskChoiceIncludeDebug,
-     switches::kNaClDebugMask, "*://*/*debug.nmf"}};
-#endif  // ENABLE_NACL
-
 const FeatureEntry::Choice kPassiveListenersChoices[] = {
     {flags_ui::kGenericExperimentChoiceDefault, "", ""},
     {flag_descriptions::kPassiveEventListenerTrue,
@@ -1277,21 +1259,6 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kAndroidSurfaceControlDescription, kOsAndroid,
      FEATURE_VALUE_TYPE(features::kAndroidSurfaceControl)},
 #endif  // OS_ANDROID
-// Native client is compiled out if ENABLE_NACL is not set.
-#if BUILDFLAG(ENABLE_NACL)
-    {"enable-nacl", flag_descriptions::kNaclName,
-     flag_descriptions::kNaclDescription, kOsAll,
-     SINGLE_VALUE_TYPE(switches::kEnableNaCl)},
-    {"enable-nacl-debug", flag_descriptions::kNaclDebugName,
-     flag_descriptions::kNaclDebugDescription, kOsDesktop,
-     SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)},
-    {"force-pnacl-subzero", flag_descriptions::kPnaclSubzeroName,
-     flag_descriptions::kPnaclSubzeroDescription, kOsDesktop,
-     SINGLE_VALUE_TYPE(switches::kForcePNaClSubzero)},
-    {"nacl-debug-mask", flag_descriptions::kNaclDebugMaskName,
-     flag_descriptions::kNaclDebugMaskDescription, kOsDesktop,
-     MULTI_VALUE_TYPE(kNaClDebugMaskChoices)},
-#endif  // ENABLE_NACL
 #if BUILDFLAG(ENABLE_EXTENSIONS)
     {"extension-apis", flag_descriptions::kExperimentalExtensionApisName,
      flag_descriptions::kExperimentalExtensionApisDescription, kOsDesktop,
@@ -1482,11 +1449,6 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kEnableExplicitDmaFencesDescription, kOsCrOS,
      SINGLE_VALUE_TYPE(switches::kEnableExplicitDmaFences)},
 #endif  // OS_CHROMEOS
-#if BUILDFLAG(ENABLE_PLUGINS)
-    {"allow-nacl-socket-api", flag_descriptions::kAllowNaclSocketApiName,
-     flag_descriptions::kAllowNaclSocketApiDescription, kOsDesktop,
-     SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*")},
-#endif  // ENABLE_PLUGINS
 #if defined(OS_CHROMEOS)
     {"allow-touchpad-three-finger-click",
      flag_descriptions::kAllowTouchpadThreeFingerClickName,

chrome/browser/flag-metadata.json

@@ -67,11 +67,6 @@
     "owners": [ "security-dev" ],
     "expiry_milestone": 76
   },
-  {
-    "name": "allow-nacl-socket-api",
-    // "owners": [ "your-team" ],
-    "expiry_milestone": 76
-  },
   {
     "name": "allow-previews",
     "owners": [ "//components/data_reduction_proxy/OWNERS" ],
@@ -1427,16 +1422,6 @@
     "owners": [ "lucmult", "noel" ],
     "expiry_milestone": 76
   },
-  {
-    "name": "enable-nacl",
-    // "owners": [ "your-team" ],
-    "expiry_milestone": 76
-  },
-  {
-    "name": "enable-nacl-debug",
-    // "owners": [ "your-team" ],
-    "expiry_milestone": 76
-  },
   {
     "name": "enable-native-controls",
     "owners": [ "chrome-media-ux@google.com" ],
@@ -2188,11 +2173,6 @@
     "owners": [ "grunell" ],
     "expiry_milestone": 80
   },
-  {
-    "name": "force-pnacl-subzero",
-    // "owners": [ "your-team" ],
-    "expiry_milestone": 76
-  },
   {
     "name": "force-show-update-menu-badge",
     "owners": [ "//chrome/android/java/src/org/chromium/chrome/browser/omaha/OWNERS" ],
@@ -2406,11 +2386,6 @@
     // "owners": [ "your-team" ],
     "expiry_milestone": 76
   },
-  {
-    "name": "nacl-debug-mask",
-    // "owners": [ "your-team" ],
-    "expiry_milestone": 76
-  },
   {
     "name": "network-service",
     // "owners": [ "your-team" ],

chrome/browser/flag_descriptions.cc

@@ -30,11 +30,6 @@ const char kAllowInsecureLocalhostDescription[] =
     "Allows requests to localhost over HTTPS even when an invalid certificate "
     "is presented.";
 
-const char kAllowNaclSocketApiName[] = "NaCl Socket API.";
-const char kAllowNaclSocketApiDescription[] =
-    "Allows applications to use NaCl Socket API. Use only to test NaCl "
-    "plugins.";
-
 const char kAllowSignedHTTPExchangeCertsWithoutExtensionName[] =
     "Allow Signed HTTP Exchange certificates without extension";
 const char kAllowSignedHTTPExchangeCertsWithoutExtensionDescription[] =
@@ -3695,36 +3690,6 @@ const char kXRSandboxDescription[] =
 
 #endif  // ENABLE_VR
 
-#if BUILDFLAG(ENABLE_NACL)
-
-const char kNaclDebugMaskName[] =
-    "Restrict Native Client GDB-based debugging by pattern";
-const char kNaclDebugMaskDescription[] =
-    "Restricts Native Client application GDB-based debugging by URL of "
-    "manifest file. Native Client GDB-based debugging must be enabled for this "
-    "option to work.";
-const char kNaclDebugMaskChoiceDebugAll[] = "Debug everything.";
-const char kNaclDebugMaskChoiceExcludeUtilsPnacl[] =
-    "Debug everything except secure shell and the PNaCl translator.";
-const char kNaclDebugMaskChoiceIncludeDebug[] =
-    "Debug only if manifest URL ends with debug.nmf.";
-
-const char kNaclDebugName[] = "Native Client GDB-based debugging";
-const char kNaclDebugDescription[] =
-    "Enable GDB debug stub. This will stop a Native Client application on "
-    "startup and wait for nacl-gdb (from the NaCl SDK) to attach to it.";
-
-const char kNaclName[] = "Native Client";
-const char kNaclDescription[] =
-    "Support Native Client for all web applications, even those that were not "
-    "installed from the Chrome Web Store.";
-
-const char kPnaclSubzeroName[] = "Force PNaCl Subzero";
-const char kPnaclSubzeroDescription[] =
-    "Force the use of PNaCl's fast Subzero translator for all pexe files.";
-
-#endif  // BUILDFLAG(ENABLE_NACL)
-
 #if BUILDFLAG(ENABLE_PLUGINS)
 
 #if defined(OS_CHROMEOS)

chrome/browser/flag_descriptions.h

@@ -11,7 +11,6 @@
 #include "build/buildflag.h"
 #include "chrome/common/buildflags.h"
 #include "components/feature_engagement/buildflags.h"
-#include "components/nacl/common/buildflags.h"
 #include "device/vr/buildflags/buildflags.h"
 #include "media/media_buildflags.h"
 #include "ppapi/buildflags/buildflags.h"
@@ -52,9 +51,6 @@ extern const char kAffiliationBasedMatchingDescription[];
 extern const char kAllowInsecureLocalhostName[];
 extern const char kAllowInsecureLocalhostDescription[];
 
-extern const char kAllowNaclSocketApiName[];
-extern const char kAllowNaclSocketApiDescription[];
-
 extern const char kAllowSignedHTTPExchangeCertsWithoutExtensionName[];
 extern const char kAllowSignedHTTPExchangeCertsWithoutExtensionDescription[];
 
@@ -2238,25 +2234,6 @@ extern const char kXRSandboxDescription[];
 
 #endif  // ENABLE_VR
 
-#if BUILDFLAG(ENABLE_NACL)
-
-extern const char kNaclDebugMaskName[];
-extern const char kNaclDebugMaskDescription[];
-extern const char kNaclDebugMaskChoiceDebugAll[];
-extern const char kNaclDebugMaskChoiceExcludeUtilsPnacl[];
-extern const char kNaclDebugMaskChoiceIncludeDebug[];
-
-extern const char kNaclDebugName[];
-extern const char kNaclDebugDescription[];
-
-extern const char kNaclName[];
-extern const char kNaclDescription[];
-
-extern const char kPnaclSubzeroName[];
-extern const char kPnaclSubzeroDescription[];
-
-#endif  // BUILDFLAG(ENABLE_NACL)
-
 #if BUILDFLAG(ENABLE_PLUGINS)
 
 #if defined(OS_CHROMEOS)