Enable the Serial API Origin Trial

In addition to setting the Origin Trial feature name inside Blink we now
need to unconditionally enable access to the Serial service and the new
settings pages.

Bug: 967863
Change-Id: I6c21566526e1590d94a6055258f8b2c511f43110
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1863360Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Commit-Queue: Reilly Grant <reillyg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#707007}

chrome/browser/resources/settings/privacy_page/privacy_page.html

@@ -556,7 +556,6 @@
           </chooser-exception-list>
         </settings-subpage>
       </template>
-      <template is="dom-if" if="[[enableExperimentalWebPlatformFeatures_]]">
       <template is="dom-if" route-path="/content/serialPorts" no-search>
         <settings-subpage page-title="$i18n{siteSettingsSerialPorts}">
           <category-default-setting
@@ -571,7 +570,6 @@
           </chooser-exception-list>
         </settings-subpage>
       </template>
-      </template>
       <template is="dom-if" if="[[enableNativeFileSystemWriteContentSetting_]]">
         <template is="dom-if" route-path="/content/filesystem" no-search>
           <settings-subpage

chrome/browser/resources/settings/site_settings/site_details.html

@@ -171,13 +171,11 @@
           category="{{ContentSettingsTypes.USB_DEVICES}}" icon="settings:usb"
           id="usbDevices" label="$i18n{siteSettingsUsbDevices}">
       </site-details-permission>
-      <template is="dom-if" if="[[enableExperimentalWebPlatformFeatures_]]">
       <site-details-permission
           category="{{ContentSettingsTypes.SERIAL_PORTS}}"
           icon="settings:serial-port" id="serialPorts"
           label="$i18n{siteSettingsSerialPorts}">
       </site-details-permission>
-      </template>
       <template is="dom-if" if="[[enableNativeFileSystemWriteContentSetting_]]">
         <site-details-permission
             category="{{ContentSettingsTypes.NATIVE_FILE_SYSTEM_WRITE}}"

chrome/browser/resources/settings/site_settings/site_settings_behavior.js

@@ -192,9 +192,6 @@ const SiteSettingsBehaviorImpl = {
       }
     };
     // These categories are gated behind flags.
-    addOrRemoveSettingWithFlag(
-        settings.ContentSettingsTypes.SERIAL_PORTS,
-        'enableExperimentalWebPlatformFeatures');
     addOrRemoveSettingWithFlag(
         settings.ContentSettingsTypes.BLUETOOTH_SCANNING,
         'enableExperimentalWebPlatformFeatures');

chrome/browser/resources/settings/site_settings_page/site_settings_page.html

@@ -189,7 +189,6 @@
             '$i18nPolymer{siteSettingsUsbDevicesAsk}',
             '$i18nPolymer{siteSettingsUsbDevicesBlock}')]]"></cr-link-row>
 
-    <template is="dom-if" if="[[enableExperimentalWebPlatformFeatures_]]">
     <cr-link-row
         class="hr two-line"
         data-route="SITE_SETTINGS_SERIAL_PORTS"
@@ -203,7 +202,6 @@
             '$i18nPolymer{siteSettingsSerialPortsAsk}',
             '$i18nPolymer{siteSettingsSerialPortsBlock}')]]">
     </cr-link-row>
-    </template>
 
     <template is="dom-if" if="[[enableNativeFileSystemWriteContentSetting_]]">
       <cr-link-row class="hr two-line"

chrome/test/data/webui/settings/site_details_tests.js

@@ -136,7 +136,6 @@ suite('SiteDetails', function() {
           settings.ContentSettingsTypes.PROTECTED_CONTENT);
     }
     const experimentalSiteDetailsContentSettingsTypes = [
-      settings.ContentSettingsTypes.SERIAL_PORTS,
       settings.ContentSettingsTypes.BLUETOOTH_SCANNING,
     ];
 

content/browser/browser_interface_binders.cc

@@ -141,13 +141,6 @@ void BindTextDetection(
   GetShapeDetectionService()->BindTextDetection(std::move(receiver));
 }
 
-#if !defined(OS_ANDROID)
-bool AreExperimentalWebPlatformFeaturesEnabled() {
-  auto* command_line = base::CommandLine::ForCurrentProcess();
-  return command_line->HasSwitch(
-      switches::kEnableExperimentalWebPlatformFeatures);
-}
-#endif
 }  // namespace
 
 // Documents/frames
@@ -284,10 +277,8 @@ void PopulateFrameBinders(RenderFrameHostImpl* host,
   map->Add<blink::mojom::InstalledAppProvider>(
       base::BindRepeating(&InstalledAppProviderImplDefault::Create));
 
-  if (AreExperimentalWebPlatformFeaturesEnabled()) {
   map->Add<blink::mojom::SerialService>(base::BindRepeating(
       &RenderFrameHostImpl::BindSerialService, base::Unretained(host)));
-  }
 #endif  // !defined(OS_ANDROID)
 }
 
@@ -360,10 +351,8 @@ void PopulateDedicatedWorkerBinders(DedicatedWorkerHost* host,
       &DedicatedWorkerHost::CreateIDBFactory, base::Unretained(host)));
 
 #if !defined(OS_ANDROID)
-  if (AreExperimentalWebPlatformFeaturesEnabled()) {
   map->Add<blink::mojom::SerialService>(base::BindRepeating(
       &DedicatedWorkerHost::BindSerialService, base::Unretained(host)));
-  }
 #endif  // !defined(OS_ANDROID)
 }
 

third_party/blink/renderer/platform/runtime_enabled_features.json5

@@ -1484,6 +1484,7 @@
     },
     {
       name: "Serial",
+      origin_trial_feature_name: "Serial",
       status: {"Android": "", "default": "experimental"},
     },
     {

third_party/blink/web_tests/http/tests/origin_trials/webexposed/serial-origin-trial-interfaces.html

+<!DOCTYPE html>
+<meta charset="utf-8">
+<!-- Generate token with the command:
+generate_token.py http://127.0.0.1:8000 Serial --expire-timestamp=2000000000
+-- -->
+<meta http-equiv="origin-trial" content="At0SGGQC1y/viEH1bb+J0N7TA5ZWcC2RlOG3l/ZpDjqo49ctt3m+xjw0p/Jnxh4IN2F5343SciSAI/cZxA7HHwAAAABOeyJvcmlnaW4iOiAiaHR0cDovLzEyNy4wLjAuMTo4MDAwIiwgImZlYXR1cmUiOiAiU2VyaWFsIiwgImV4cGlyeSI6IDIwMDAwMDAwMDB9" />
+<title>Serial - interfaces exposed by origin trial</title>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="../../resources/origin-trials-helper.js"></script>
+<script>
+test(t => {
+  OriginTrialsHelper.check_properties_exist(this,
+      {
+        'Navigator': ['serial'],
+        'SerialPort': ['close', 'getSignals', 'open', 'readable', 'setSignals',
+                       'writable'],
+        'Serial': ['getPorts', 'requestPort'],
+      },
+  );
+}, "Serial related interfaces in Origin-Trial enabled document.");
+
+</script>