[webnfc] Remove flag from about:flags

The flag to enable WebNFC is now the regular experimental web platform
features flag. The "WebNFC" feature can still be used as a kill-switch
but should not normally be touched by users or developers.

Bug: 1035048
Change-Id: I7989ccd610affb5f0b8341f112a583e5dbacc3f9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2071365Reviewed-by: Ovidio de Jesús Ruiz-Henríquez <odejesush@chromium.org>
Commit-Queue: Reilly Grant <reillyg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746090}

chrome/browser/about_flags.cc

@@ -3032,12 +3032,6 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kForceColorProfileDescription, kOsAll,
      MULTI_VALUE_TYPE(kForceColorProfileChoices)},
 
-#if defined(OS_ANDROID)
-    {"enable-webnfc", flag_descriptions::kEnableWebNfcName,
-     flag_descriptions::kEnableWebNfcDescription, kOsAndroid,
-     FEATURE_VALUE_TYPE(features::kWebNfc)},
-#endif
-
     {"force-effective-connection-type",
      flag_descriptions::kForceEffectiveConnectionTypeName,
      flag_descriptions::kForceEffectiveConnectionTypeDescription, kOsAll,

chrome/browser/flag-metadata.json

@@ -2041,11 +2041,6 @@
     "owners": [ "webgl-team@google.com" ],
     "expiry_milestone": 85
   },
-  {
-    "name": "enable-webnfc",
-    "owners": [ "rijubrata.bhaumik@intel.com","reillyg" ],
-    "expiry_milestone": 82
-  },
   {
     "name": "enable-webrtc-capture-multi-channel-audio-processing",
     "owners": [ "saza" ],

chrome/browser/flag_descriptions.cc

@@ -2349,9 +2349,6 @@ const char kEnableOfflinePreviewsName[] = "Offline Page Previews";
 const char kEnableOfflinePreviewsDescription[] =
     "Enable showing offline page previews on slow networks.";
 
-const char kEnableWebNfcName[] = "WebNFC";
-const char kEnableWebNfcDescription[] = "Enable WebNFC support.";
-
 const char kEphemeralTabUsingBottomSheetName[] =
     "An ephemeral Preview Tab using the bottom sheet";
 const char kEphemeralTabUsingBottomSheetDescription[] =

chrome/browser/flag_descriptions.h

@@ -1362,9 +1362,6 @@ extern const char kEnableRevampedContextMenuDescription[];
 extern const char kEnableOfflinePreviewsName[];
 extern const char kEnableOfflinePreviewsDescription[];
 
-extern const char kEnableWebNfcName[];
-extern const char kEnableWebNfcDescription[];
-
 extern const char kEphemeralTabUsingBottomSheetName[];
 extern const char kEphemeralTabUsingBottomSheetDescription[];