Add a flag for enabling/disabling the navigator content utils

As a part of removing ENABLE(NAVIGATOR_CONTENT_UTILS), this cl add a flag for the navigator content utils
and enable it except for android.

BUG=N/A

Review URL: https://codereview.chromium.org/104123003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239691 0039d316-1c4b-4281-b951-d872f2087c98

content/child/runtime_features.cc

@@ -40,6 +40,8 @@ static void SetRuntimeFeatureDefaultsForPlatform() {
   WebRuntimeFeatures::enableNotifications(false);
   // Android does not yet support SharedWorker. crbug.com/154571
   WebRuntimeFeatures::enableSharedWorker(false);
+  // Android does not yet support NavigatorContentUtils.
+  WebRuntimeFeatures::enableNavigatorContentUtils(false);
 #endif  // defined(OS_ANDROID)
 }
 
@@ -61,6 +63,9 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs(
   if (command_line.HasSwitch(switches::kDisableDesktopNotifications))
     WebRuntimeFeatures::enableNotifications(false);
 
+  if (command_line.HasSwitch(switches::kDisableNavigatorContentUtils))
+    WebRuntimeFeatures::enableNavigatorContentUtils(false);
+
   if (command_line.HasSwitch(switches::kDisableLocalStorage))
     WebRuntimeFeatures::enableLocalStorage(false);
 

content/public/common/content_switches.cc

@@ -151,6 +151,10 @@ const char kDisableDelegatedRenderer[]      = "disable-delegated-renderer";
 // Disables desktop notifications (default enabled on windows).
 const char kDisableDesktopNotifications[]   = "disable-desktop-notifications";
 
+// Disables experimental navigator content utils implementation.
+const char kDisableNavigatorContentUtils[]  =
+      "disable-navigator-content-utils";
+
 // Disable device motion events.
 const char kDisableDeviceMotion[]           = "disable-device-motion";
 

content/public/common/content_switches.h

@@ -86,6 +86,7 @@ CONTENT_EXPORT extern const char kDisablePrefixedEncryptedMedia[];
 extern const char kDisableKillAfterBadIPC[];
 CONTENT_EXPORT extern const char kDisableLocalStorage[];
 CONTENT_EXPORT extern const char kDisableLogging[];
+extern const char kDisableNavigatorContentUtils[];
 extern const char kDisablePepper3d[];
 CONTENT_EXPORT extern const char kDisablePinch[];
 CONTENT_EXPORT extern const char kDisablePlugins[];