Skip to content

GitLab

T
tangled
Commit 9926254e authored by Austin Sullivan's avatar Austin Sullivan Committed by Chromium LUCI CQ
Browse files
Options

[FSA] Remove NativeFileSystem2 origin trial 

The origin trial is no longer needed, since the feature has already
shipped.

This change was originally proposed in this refactor [1], but was split
into another CL.

[1] https://crrev.com/c/2601576

Bug: 1110509
Change-Id: I77e674763879ae74eeb33c3da2844ab42dd8b533
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2604977
Commit-Queue: Austin Sullivan <asully@chromium.org>
Reviewed-by: default avatarKinuko Yasuda <kinuko@chromium.org>
Reviewed-by: default avatarGiovanni Ortuño Urquidi <ortuno@chromium.org>
Cr-Commit-Position: refs/heads/master@{#841531}
parent a779cc7d
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 33 deletions
chrome/browser/web_applications/system_web_app_manager.cc
View file @ 9926254e
......@@ -132,10 +132,8 @@ base::flat_map<SystemAppType, SystemAppInfo> CreateSystemWebApps(
extension_misc::kCameraAppId};
}
// We need "FileHandling" to use File Handling API to set launch directory.
// And we need "NativeFileSystem2" to use Native File System API.
infos.at(SystemAppType::CAMERA).enabled_origin_trials =
OriginTrialsMap({{GetOrigin("chrome://camera-app"),
{"FileHandling", "NativeFileSystem2"}}});
OriginTrialsMap({{GetOrigin("chrome://camera-app"), {"FileHandling"}}});
infos.at(SystemAppType::CAMERA).capture_navigations = true;
// TODO(b/172343409): Remove this log when the camera app is fully migrated
......@@ -192,8 +190,7 @@ base::flat_map<SystemAppType, SystemAppInfo> CreateSystemWebApps(
infos.at(SystemAppType::MEDIA).show_in_launcher = false;
infos.at(SystemAppType::MEDIA).show_in_search = false;
infos.at(SystemAppType::MEDIA).enabled_origin_trials =
OriginTrialsMap({{GetOrigin("chrome://media-app"),
{"FileHandling", "NativeFileSystem2"}}});
OriginTrialsMap({{GetOrigin("chrome://media-app"), {"FileHandling"}}});
}
if (SystemWebAppManager::IsAppEnabled(SystemAppType::PRINT_MANAGEMENT)) {
......
chrome/browser/web_applications/system_web_app_manager_browsertest.cc
View file @ 9926254e
......@@ -915,7 +915,7 @@ class SystemWebAppManagerFileHandlingOriginTrialsBrowserTest
maybe_installation_ =
TestSystemWebAppInstallation::SetUpAppWithEnabledOriginTrials(
OriginTrialsMap({{GetOrigin(GURL("chrome://test-system-app/")),
{"NativeFileSystem2", "FileHandling"}}}),
{"FileHandling"}}}),
install_from_web_app_info());
}
......@@ -1073,7 +1073,7 @@ class SystemWebAppManagerUninstallBrowserTest
TestSystemWebAppInstallation::SetUpAppWithEnabledOriginTrials(
OriginTrialsMap(
{{url::Origin::Create(GURL("chrome://test-system-app/")),
{"NativeFileSystem2", "FileHandling"}}}),
{"FileHandling"}}}),
install_from_web_app_info());
} else {
maybe_installation_ = TestSystemWebAppInstallation::SetUpWithoutApps();
......
third_party/blink/renderer/platform/runtime_enabled_features.json5
View file @ 9926254e
......@@ -882,13 +882,8 @@
status: "stable",
},
{
// Also enabled when blink::features::kNativeFileSystemAPI is overridden
// on the command line (or via chrome://flags).
name: "FileSystemAccess",
status: {"Android": "test", "default": "stable"},
// TODO(mek): Remove origin trial integration.
origin_trial_feature_name: "NativeFileSystem2",
origin_trial_os: ["win", "mac", "linux", "chromeos"],
},
{
// In-development features for the File System Access API.
......
third_party/blink/web_tests/http/tests/origin_trials/webexposed/file-system-access-origin-trial-interfaces.html deleted 100644 → 0
View file @ a779cc7d
<!DOCTYPE html>
<meta charset="utf-8">
<!-- Generate token with the command:
generate_token.py http://127.0.0.1:8000 NativeFileSystem2 --expire-timestamp=2000000000
-- -->
<meta http-equiv="origin-trial" content="AmmBxJTKsdbb26LLpdAVmIKBvVxU6fKf6UZDoMXiD+b9bULkOHzUTtZ4dNwHMhI7tZzO+tNgmWCzNK2MLoZsvAEAAABZeyJvcmlnaW4iOiAiaHR0cDovLzEyNy4wLjAuMTo4MDAwIiwgImZlYXR1cmUiOiAiTmF0aXZlRmlsZVN5c3RlbTIiLCAiZXhwaXJ5IjogMjAwMDAwMDAwMH0=">
<title>File System Access API - 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, {
'FileSystemHandle': ['kind', 'name', 'queryPermission', 'requestPermission'],
'FileSystemFileHandle': ['getFile', 'createWritable'],
'FileSystemDirectoryHandle': ['getFileHandle', 'getDirectoryHandle', 'entries', 'removeEntry'],
'FileSystemWritableFileStream': ['write', 'truncate', 'close', 'seek'],
'global': ['showOpenFilePicker', 'showSaveFilePicker', 'showDirectoryPicker'],
});
}, 'File System Access API interfaces and properties in Origin-Trial enabled document.');
</script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment