Fix up WebXR Origin Trial names and formatting

Most of the Origin Trial names do not have spaces, so update this one
to match. Also, some things needs to alphabetized.

Bug: 779691
Change-Id: Ic7c45e751b35817c4bbaceb0b9f451cd375e4840
Reviewed-on: https://chromium-review.googlesource.com/1006044Reviewed-by: David Dorwin <ddorwin@chromium.org>
Reviewed-by: Pavel Feldman <pfeldman@chromium.org>
Commit-Queue: David Dorwin <ddorwin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550089}

chrome/browser/flag_descriptions.cc

@@ -760,8 +760,7 @@ const char kFramebustingDescription[] =
 
 const char kGamepadExtensionsName[] = "Gamepad Extensions";
 const char kGamepadExtensionsDescription[] =
-    "Enables experimental extensions to the Gamepad APIs, and exposes VR "
-    "controllers as Gamepads for WebVR";
+    "Enables experimental extensions to the Gamepad APIs.";
 
 const char kGpuRasterizationMsaaSampleCountName[] =
     "GPU rasterization MSAA sample count.";
@@ -1781,8 +1780,7 @@ const char kWebvrDescription[] =
     "WebVR 1.1 API. This feature will eventually be replaced by the WebXR "
     "Device API. Warning: Enabling this will also allow WebVR content on "
     "insecure origins to access these powerful APIs, and may pose a security "
-    "risk. Controllers are exposed as Gamepads and Gamepad Extensions are "
-    "enabled.";
+    "risk. Controllers are exposed as Gamepads.";
 
 const char kWebXrName[] = "WebXR Device API";
 const char kWebXrDescription[] =
@@ -1792,7 +1790,8 @@ const char kWebXrDescription[] =
 const char kWebXrGamepadSupportName[] = "WebXR Gamepad Support";
 const char kWebXrGamepadSupportDescription[] =
     "Expose VR controllers as Gamepads for use with the WebXR Device API. Each "
-    "XRInputSource will have a corresponding Gamepad instance.";
+    "XRInputSource will have a corresponding Gamepad instance. Requires that "
+    "WebXR Device API is also enabled.";
 
 const char kWebXrHitTestName[] = "WebXR Hit Test";
 const char kWebXrHitTestDescription[] =

chrome/browser/flag_descriptions.h

@@ -482,8 +482,6 @@ extern const char kFramebustingDescription[];
 
 extern const char kGamepadExtensionsName[];
 extern const char kGamepadExtensionsDescription[];
-extern const char kWebXrGamepadSupportName[];
-extern const char kWebXrGamepadSupportDescription[];
 
 extern const char kGpuRasterizationMsaaSampleCountName[];
 extern const char kGpuRasterizationMsaaSampleCountDescription[];
@@ -1093,6 +1091,8 @@ extern const char kWebvrDescription[];
 
 extern const char kWebXrName[];
 extern const char kWebXrDescription[];
+extern const char kWebXrGamepadSupportName[];
+extern const char kWebXrGamepadSupportDescription[];
 
 extern const char kWebXrHitTestName[];
 extern const char kWebXrHitTestDescription[];

content/public/common/content_features.cc

@@ -121,13 +121,12 @@ const base::Feature kFramebustingNeedsSameOriginOrUserGesture{
     "FramebustingNeedsSameOriginOrUserGesture",
     base::FEATURE_ENABLED_BY_DEFAULT};
 
-// Enables extended Gamepad API features like motion tracking and haptics, and
-// exposing VR inputs and controllers as GamePads.
+// Enables extended Gamepad API features like motion tracking and haptics.
 const base::Feature kGamepadExtensions{"GamepadExtensions",
                                        base::FEATURE_DISABLED_BY_DEFAULT};
-// Enables extended Gamepad API features that expose VR controllers as Gamepads
-// for use with WebXR Device API. Each XRInputSource will have a corresponding
-// Gamepad instance.
+// When WebXR Device API is enabled, exposes VR controllers as Gamepads and
+// enables additional Gamepad attributes for use with WebXR Device API. Each
+// XRInputSource will have a corresponding Gamepad instance.
 const base::Feature kWebXrGamepadSupport{"WebXRGamepadSupport",
                                          base::FEATURE_DISABLED_BY_DEFAULT};
 

content/public/common/content_features.h

@@ -40,7 +40,6 @@ CONTENT_EXPORT extern const base::Feature kFontCacheScaling;
 CONTENT_EXPORT extern const base::Feature
     kFramebustingNeedsSameOriginOrUserGesture;
 CONTENT_EXPORT extern const base::Feature kGamepadExtensions;
-CONTENT_EXPORT extern const base::Feature kWebXrGamepadSupport;
 CONTENT_EXPORT extern const base::Feature kGuestViewCrossProcessFrames;
 CONTENT_EXPORT extern const base::Feature kHeapCompaction;
 CONTENT_EXPORT extern const base::Feature kImageCaptureAPI;
@@ -128,6 +127,7 @@ CONTENT_EXPORT extern const base::Feature kWebRtcUseGpuMemoryBufferVideoFrames;
 CONTENT_EXPORT extern const base::Feature kWebUsb;
 CONTENT_EXPORT extern const base::Feature kWebVrVsyncAlign;
 CONTENT_EXPORT extern const base::Feature kWebXr;
+CONTENT_EXPORT extern const base::Feature kWebXrGamepadSupport;
 CONTENT_EXPORT extern const base::Feature kWebXrHitTest;
 CONTENT_EXPORT extern const base::Feature kWebXrOrientationSensorDevice;
 CONTENT_EXPORT extern const base::Feature kWorkStealingInScriptRunner;

third_party/blink/public/platform/web_runtime_features.h

@@ -83,7 +83,6 @@ class WebRuntimeFeatures {
   BLINK_PLATFORM_EXPORT static void EnableFileSystem(bool);
   BLINK_PLATFORM_EXPORT static void EnableForceTallerSelectPopup(bool);
   BLINK_PLATFORM_EXPORT static void EnableGamepadExtensions(bool);
-  BLINK_PLATFORM_EXPORT static void EnableWebXRGamepadSupport(bool);
   BLINK_PLATFORM_EXPORT static void EnableGenericSensor(bool);
   BLINK_PLATFORM_EXPORT static void EnableGenericSensorExtraClasses(bool);
   BLINK_PLATFORM_EXPORT static void EnableHeapCompaction(bool);
@@ -151,6 +150,7 @@ class WebRuntimeFeatures {
   BLINK_PLATFORM_EXPORT static void EnableWebUsb(bool);
   BLINK_PLATFORM_EXPORT static void EnableWebVR(bool);
   BLINK_PLATFORM_EXPORT static void EnableWebXR(bool);
+  BLINK_PLATFORM_EXPORT static void EnableWebXRGamepadSupport(bool);
   BLINK_PLATFORM_EXPORT static void EnableXSLT(bool);
   BLINK_PLATFORM_EXPORT static void ForceOverlayFullscreenVideo(bool);
   BLINK_PLATFORM_EXPORT static void EnableAutoplayMutedVideos(bool);

third_party/blink/renderer/platform/exported/web_runtime_features.cc

@@ -140,10 +140,6 @@ void WebRuntimeFeatures::EnableGamepadExtensions(bool enable) {
   RuntimeEnabledFeatures::SetGamepadExtensionsEnabled(enable);
 }
 
-void WebRuntimeFeatures::EnableWebXRGamepadSupport(bool enable) {
-  RuntimeEnabledFeatures::SetWebXRGamepadSupportEnabled(enable);
-}
-
 void WebRuntimeFeatures::EnableGenericSensor(bool enable) {
   RuntimeEnabledFeatures::SetSensorEnabled(enable);
 }
@@ -358,6 +354,10 @@ void WebRuntimeFeatures::EnableWebXR(bool enable) {
   RuntimeEnabledFeatures::SetWebXREnabled(enable);
 }
 
+void WebRuntimeFeatures::EnableWebXRGamepadSupport(bool enable) {
+  RuntimeEnabledFeatures::SetWebXRGamepadSupportEnabled(enable);
+}
+
 void WebRuntimeFeatures::EnablePresentationAPI(bool enable) {
   RuntimeEnabledFeatures::SetPresentationEnabled(enable);
 }

third_party/blink/renderer/platform/runtime_enabled_features.json5

@@ -1307,14 +1307,14 @@
     },
     {
       name: "WebXR",
-      origin_trial_feature_name: "WebXR Device",
+      origin_trial_feature_name: "WebXRDevice",
       status: "test",
     },
     // Subset of the GamepadExtensions wanted for WebXR, which expose VR controller
     // functionality as Gamepads.
     {
       name: "WebXRGamepadSupport",
-      origin_trial_feature_name: "WebXR Gamepad Support",
+      origin_trial_feature_name: "WebXRGamepadSupport",
       // This feature is a strict subset of GamepadExtensions.
       implied_by: ["GamepadExtensions"],
       status: "test",