e20fe2f18ee374414f0e074d58ecdb99734b33a3 - chromium/src

[chen...@google.com]

commit e20fe2f18ee374414f0e074d58ecdb99734b33a3
Author: Charlie Hu <chen...@google.com>
AuthorDate: Sun Mar 07 03:39:59 2021
Commit: Chromium LUCI CQ <chromiu...@luci-project-accounts.iam.gserviceaccount.com>
CommitDate: Sun Mar 07 03:39:59 2021

[Permissions Policy] Rename 'feature_policy' in variables

Bug: 1123116
Change-Id: Id93a94045f7b26a2bcdd9268603c112c8cfb950d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2727596
Commit-Queue: Charlie Hu <chen...@google.com>
Reviewed-by: Daniel Cheng <dch...@chromium.org>
Reviewed-by: Ian Clelland <icle...@chromium.org>
Owners-Override: Daniel Cheng <dch...@chromium.org>
Cr-Commit-Position: refs/heads/master@{#860572}

diff --git a/chrome/browser/federated_learning/floc_eligibility_unittest.cc b/chrome/browser/federated_learning/floc_eligibility_unittest.cc
index 522faa5..5633da76 100644
--- a/chrome/browser/federated_learning/floc_eligibility_unittest.cc
+++ b/chrome/browser/federated_learning/floc_eligibility_unittest.cc
@@ -90,7 +90,7 @@

void NavigateToPage(const GURL& url,
bool publicly_routable,
- bool floc_feature_policy_enabled) {
+ bool floc_permissions_policy_enabled) {
auto simulator = content::NavigationSimulator::CreateBrowserInitiated(
url, GetWebContents());
simulator->SetTransition(ui::PageTransition::PAGE_TRANSITION_TYPED);
@@ -101,7 +101,7 @@
simulator->SetSocketAddress(net::IPEndPoint(address, /*port=*/0));
}

- if (!floc_feature_policy_enabled) {
+ if (!floc_permissions_policy_enabled) {
simulator->SetFeaturePolicyHeader(
{{blink::mojom::PermissionsPolicyFeature::kInterestCohort,
/*values=*/{}, /*matches_all_origins=*/false,
@@ -143,7 +143,7 @@
TEST_F(FlocEligibilityUnitTest, OnInterestCohortApiUsed) {
GURL url("https://foo.com");
NavigateToPage(url, /*publicly_routable=*/true,
- /*floc_feature_policy_enabled=*/true);
+ /*floc_permissions_policy_enabled=*/true);

EXPECT_FALSE(IsUrlVisitEligibleToComputeFloc(url));

@@ -154,7 +154,7 @@
TEST_F(FlocEligibilityUnitTest, OnAdResourceObserved) {
GURL url("https://foo.com");
NavigateToPage(url, /*publicly_routable=*/true,
- /*floc_feature_policy_enabled=*/true);
+ /*floc_permissions_policy_enabled=*/true);

EXPECT_FALSE(IsUrlVisitEligibleToComputeFloc(url));

@@ -165,7 +165,7 @@
TEST_F(FlocEligibilityUnitTest, OnNonAdResourceObserved) {
GURL url("https://foo.com");
NavigateToPage(url, /*publicly_routable=*/true,
- /*floc_feature_policy_enabled=*/true);
+ /*floc_permissions_policy_enabled=*/true);

EXPECT_FALSE(IsUrlVisitEligibleToComputeFloc(url));

@@ -176,7 +176,7 @@
TEST_F(FlocEligibilityUnitTest, StopObservingPrivateIP) {
GURL url("https://foo.com");
NavigateToPage(url, /*publicly_routable=*/false,
- /*floc_feature_policy_enabled=*/true);
+ /*floc_permissions_policy_enabled=*/true);

EXPECT_FALSE(IsUrlVisitEligibleToComputeFloc(url));

@@ -190,7 +190,7 @@
TEST_F(FlocEligibilityUnitTest, StopObservingFlocFeaturePolicyDisabled) {
GURL url("https://foo.com");
NavigateToPage(url, /*publicly_routable=*/true,
- /*floc_feature_policy_enabled=*/false);
+ /*floc_permissions_policy_enabled=*/false);

EXPECT_FALSE(IsUrlVisitEligibleToComputeFloc(url));

@@ -229,7 +229,7 @@
TEST_F(FlocEligibilityIncognitoUnitTest, SkipSettingFlocAllowedInIncognito) {
GURL url("https://foo.com");
NavigateToPage(url, /*publicly_routable=*/true,
- /*floc_feature_policy_enabled=*/true);
+ /*floc_permissions_policy_enabled=*/true);

SimulateResourceDataUseUpdate(/*is_ad_resource=*/true);

diff --git a/chrome/browser/media/webrtc/permission_bubble_media_access_handler.cc b/chrome/browser/media/webrtc/permission_bubble_media_access_handler.cc
index 360122c..164b4e5 100644
--- a/chrome/browser/media/webrtc/permission_bubble_media_access_handler.cc
+++ b/chrome/browser/media/webrtc/permission_bubble_media_access_handler.cc
@@ -288,7 +288,7 @@
content::MediaStreamRequest request,
const blink::MediaStreamDevices& devices,
blink::mojom::MediaStreamRequestResult result,
- bool blocked_by_feature_policy,
+ bool blocked_by_permissions_policy,
ContentSetting audio_setting,
ContentSetting video_setting) {
if (pending_requests_.find(web_contents) == pending_requests_.end()) {
@@ -299,7 +299,7 @@
// If the kill switch is, or the request was blocked because of feature
// policy we don't update the tab context.
if (result != blink::mojom::MediaStreamRequestResult::KILL_SWITCH_ON &&
- !blocked_by_feature_policy) {
+ !blocked_by_permissions_policy) {
UpdatePageSpecificContentSettings(web_contents, request, audio_setting,
video_setting);
}
diff --git a/chrome/browser/media/webrtc/permission_bubble_media_access_handler.h b/chrome/browser/media/webrtc/permission_bubble_media_access_handler.h
index f635a42..3830b75 100644
--- a/chrome/browser/media/webrtc/permission_bubble_media_access_handler.h
+++ b/chrome/browser/media/webrtc/permission_bubble_media_access_handler.h
@@ -60,7 +60,7 @@
content::MediaStreamRequest request,
const blink::MediaStreamDevices& devices,
blink::mojom::MediaStreamRequestResult result,
- bool blocked_by_feature_policy,
+ bool blocked_by_permissions_policy,
ContentSetting audio_setting,
ContentSetting video_setting);
void OnAccessRequestResponse(content::WebContents* web_contents,
diff --git a/chrome/browser/policy/media_stream_policy_browsertest.cc b/chrome/browser/policy/media_stream_policy_browsertest.cc
index bc9c67c..ccf09f9 100644
--- a/chrome/browser/policy/media_stream_policy_browsertest.cc
+++ b/chrome/browser/policy/media_stream_policy_browsertest.cc
@@ -105,7 +105,7 @@

void Accept(const blink::MediaStreamDevices& devices,
blink::mojom::MediaStreamRequestResult result,
- bool blocked_by_feature_policy,
+ bool blocked_by_permissions_policy,
ContentSetting audio_setting,
ContentSetting video_setting) {
if (policy_value_ || request_url_allowed_via_whitelist_) {
diff --git a/components/permissions/permission_context_base.cc b/components/permissions/permission_context_base.cc
index 84af649b..f2669f6 100644
--- a/components/permissions/permission_context_base.cc
+++ b/components/permissions/permission_context_base.cc
@@ -100,10 +100,10 @@
PermissionContextBase::PermissionContextBase(
content::BrowserContext* browser_context,
ContentSettingsType content_settings_type,
- blink::mojom::PermissionsPolicyFeature feature_policy_feature)
+ blink::mojom::PermissionsPolicyFeature permissions_policy_feature)
: browser_context_(browser_context),
content_settings_type_(content_settings_type),
- feature_policy_feature_(feature_policy_feature) {
+ permissions_policy_feature_(permissions_policy_feature) {
PermissionDecisionAutoBlocker::UpdateFromVariations();
}

@@ -473,11 +473,11 @@
bool PermissionContextBase::PermissionAllowedByFeaturePolicy(
content::RenderFrameHost* rfh) const {
// Some features don't have an associated permissions policy yet. Allow those.
- if (feature_policy_feature_ ==
+ if (permissions_policy_feature_ ==
blink::mojom::PermissionsPolicyFeature::kNotFound)
return true;

- return rfh->IsFeatureEnabled(feature_policy_feature_);
+ return rfh->IsFeatureEnabled(permissions_policy_feature_);
}

} // namespace permissions
diff --git a/components/permissions/permission_context_base.h b/components/permissions/permission_context_base.h
index cd5fbdd..7b78261 100644
--- a/components/permissions/permission_context_base.h
+++ b/components/permissions/permission_context_base.h
@@ -61,7 +61,7 @@
PermissionContextBase(
content::BrowserContext* browser_context,
ContentSettingsType content_settings_type,
- blink::mojom::PermissionsPolicyFeature feature_policy_feature);
+ blink::mojom::PermissionsPolicyFeature permissions_policy_feature);
~PermissionContextBase() override;

// A field trial used to enable the global permissions kill switch.
@@ -187,7 +187,7 @@

content::BrowserContext* browser_context_;
const ContentSettingsType content_settings_type_;
- const blink::mojom::PermissionsPolicyFeature feature_policy_feature_;
+ const blink::mojom::PermissionsPolicyFeature permissions_policy_feature_;
std::unordered_map<std::string, std::unique_ptr<PermissionRequest>>
pending_requests_;

diff --git a/components/permissions/permission_manager_unittest.cc b/components/permissions/permission_manager_unittest.cc
index 50d7dd4..0618e48 100644
--- a/components/permissions/permission_manager_unittest.cc
+++ b/components/permissions/permission_manager_unittest.cc
@@ -42,10 +42,10 @@
FakePermissionContext(
content::BrowserContext* browser_context,
ContentSettingsType content_settings_type,
- blink::mojom::PermissionsPolicyFeature feature_policy_feature)
+ blink::mojom::PermissionsPolicyFeature permissions_policy_feature)
: PermissionContextBase(browser_context,
content_settings_type,
- feature_policy_feature) {}
+ permissions_policy_feature) {}

// PermissionContextBase:
bool IsRestrictedToSecureOrigins() const override { return true; }
@@ -56,10 +56,10 @@
FakePermissionContextAlwaysAllow(
content::BrowserContext* browser_context,
ContentSettingsType content_settings_type,
- blink::mojom::PermissionsPolicyFeature feature_policy_feature)
+ blink::mojom::PermissionsPolicyFeature permissions_policy_feature)
: FakePermissionContext(browser_context,
content_settings_type,
- feature_policy_feature) {}
+ permissions_policy_feature) {}

// PermissionContextBase:
ContentSetting GetPermissionStatusInternal(
diff --git a/components/webrtc/media_stream_devices_controller.cc b/components/webrtc/media_stream_devices_controller.cc
index 0f3c04f..6285c4d 100644
--- a/components/webrtc/media_stream_devices_controller.cc
+++ b/components/webrtc/media_stream_devices_controller.cc
@@ -130,7 +130,7 @@
if (permission_status.content_setting == CONTENT_SETTING_BLOCK) {
controller->denial_reason_ =
blink::mojom::MediaStreamRequestResult::PERMISSION_DENIED;
- controller->RunCallback(/*blocked_by_feature_policy=*/false);
+ controller->RunCallback(/*blocked_by_permissions_policy=*/false);
return;
}

@@ -374,7 +374,8 @@
return devices;
}

-void MediaStreamDevicesController::RunCallback(bool blocked_by_feature_policy) {
+void MediaStreamDevicesController::RunCallback(
+ bool blocked_by_permissions_policy) {
CHECK(callback_);

MediaStreamDevices devices;
@@ -397,8 +398,9 @@
request_result = denial_reason_;
}

- std::move(callback_).Run(devices, request_result, blocked_by_feature_policy,
- audio_setting_, video_setting_);
+ std::move(callback_).Run(devices, request_result,
+ blocked_by_permissions_policy, audio_setting_,
+ video_setting_);
}

ContentSetting MediaStreamDevicesController::GetContentSetting(
@@ -489,12 +491,12 @@
const std::vector<ContentSetting>& responses) {
bool need_audio = ShouldRequestAudio();
bool need_video = ShouldRequestVideo();
- bool blocked_by_feature_policy = need_audio || need_video;
+ bool blocked_by_permissions_policy = need_audio || need_video;
// The audio setting will always be the first one in the vector, if it was
// requested.
if (need_audio) {
audio_setting_ = responses.front();
- blocked_by_feature_policy &=
+ blocked_by_permissions_policy &=
audio_setting_ == CONTENT_SETTING_BLOCK &&
PermissionIsBlockedForReason(
ContentSettingsType::MEDIASTREAM_MIC,
@@ -503,7 +505,7 @@

if (need_video) {
video_setting_ = responses.at(need_audio ? 1 : 0);
- blocked_by_feature_policy &=
+ blocked_by_permissions_policy &=
video_setting_ == CONTENT_SETTING_BLOCK &&
PermissionIsBlockedForReason(
ContentSettingsType::MEDIASTREAM_CAMERA,
@@ -519,7 +521,7 @@
blink::mojom::MediaStreamRequestResult::PERMISSION_DISMISSED;
}

- RunCallback(blocked_by_feature_policy);
+ RunCallback(blocked_by_permissions_policy);
}

bool MediaStreamDevicesController::HasAvailableDevices(
diff --git a/components/webrtc/media_stream_devices_controller.h b/components/webrtc/media_stream_devices_controller.h
index 73d035a..5714aa4 100644
--- a/components/webrtc/media_stream_devices_controller.h
+++ b/components/webrtc/media_stream_devices_controller.h
@@ -34,7 +34,7 @@
public:
typedef base::OnceCallback<void(const blink::MediaStreamDevices& devices,
blink::mojom::MediaStreamRequestResult result,
- bool blocked_by_feature_policy,
+ bool blocked_by_permissions_policy,
ContentSetting audio_setting,
ContentSetting video_setting)>
ResultCallback;
@@ -84,7 +84,7 @@
ContentSetting video_setting);

// Runs |callback_| with the current audio/video permission settings.
- void RunCallback(bool blocked_by_feature_policy);
+ void RunCallback(bool blocked_by_permissions_policy);

// Returns the content settings for the given content type and request.
ContentSetting GetContentSetting(
diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/client_hints/client_hints.cc
index 38362e2..b467bab6 100644
--- a/content/browser/client_hints/client_hints.cc
+++ b/content/browser/client_hints/client_hints.cc
@@ -405,7 +405,7 @@
RenderFrameHostImpl* main_frame =
frame_tree_node->frame_tree()->GetMainFrame();
main_frame_url = main_frame->GetLastCommittedURL();
- feature_policy = main_frame->feature_policy();
+ permissions_policy = main_frame->permissions_policy();
is_1p_origin = resource_origin.IsSameOriginWith(
main_frame->GetLastCommittedOrigin());
}
@@ -417,7 +417,7 @@
url::Origin resource_origin;
bool is_main_frame = false;
GURL main_frame_url;
- const blink::PermissionsPolicy* feature_policy = nullptr;
+ const blink::PermissionsPolicy* permissions_policy = nullptr;
bool is_1p_origin = false;
};

@@ -425,8 +425,8 @@
network::mojom::WebClientHintsType type) {
if (!IsFeaturePolicyForClientHintsEnabled() || data.is_main_frame)
return data.is_1p_origin;
- return data.feature_policy &&
- data.feature_policy->IsFeatureEnabledForOrigin(
+ return data.permissions_policy &&
+ data.permissions_policy->IsFeatureEnabledForOrigin(
blink::kClientHintsFeaturePolicyMapping[static_cast<int>(type)],
data.resource_origin);
}
diff --git a/content/browser/geolocation/geolocation_service_impl_unittest.cc b/content/browser/geolocation/geolocation_service_impl_unittest.cc
index b5f71ca..604e1b4 100644
--- a/content/browser/geolocation/geolocation_service_impl_unittest.cc
+++ b/content/browser/geolocation/geolocation_service_impl_unittest.cc
@@ -93,10 +93,11 @@
RenderViewHostImplTestHarness::TearDown();
}

- void CreateEmbeddedFrameAndGeolocationService(bool allow_via_feature_policy) {
+ void CreateEmbeddedFrameAndGeolocationService(
+ bool allow_via_permissions_policy) {
const GURL kEmbeddedUrl("https://embeddables.com/someframe");
blink::ParsedPermissionsPolicy frame_policy = {};
- if (allow_via_feature_policy) {
+ if (allow_via_permissions_policy) {
frame_policy.push_back(
{blink::mojom::PermissionsPolicyFeature::kGeolocation,
std::vector<url::Origin>{url::Origin::Create(kEmbeddedUrl)}, false,
@@ -142,7 +143,8 @@

TEST_F(GeolocationServiceTest, PermissionGrantedPolicyViolation) {
// The embedded frame is not allowed.
- CreateEmbeddedFrameAndGeolocationService(/*allow_via_feature_policy=*/false);
+ CreateEmbeddedFrameAndGeolocationService(
+ /*allow_via_permissions_policy=*/false);

permission_manager()->SetRequestCallback(
base::BindRepeating([](PermissionCallback callback) {
@@ -166,7 +168,8 @@

TEST_F(GeolocationServiceTest, PermissionGrantedNoPolicyViolation) {
// Allow the embedded frame.
- CreateEmbeddedFrameAndGeolocationService(/*allow_via_feature_policy=*/true);
+ CreateEmbeddedFrameAndGeolocationService(
+ /*allow_via_permissions_policy=*/true);

permission_manager()->SetRequestCallback(
base::BindRepeating([](PermissionCallback callback) {
@@ -194,7 +197,8 @@
}

TEST_F(GeolocationServiceTest, PermissionGrantedSync) {
- CreateEmbeddedFrameAndGeolocationService(/*allow_via_feature_policy=*/true);
+ CreateEmbeddedFrameAndGeolocationService(
+ /*allow_via_permissions_policy=*/true);
permission_manager()->SetRequestCallback(
base::BindRepeating([](PermissionCallback callback) {
std::move(callback).Run(PermissionStatus::GRANTED);
@@ -221,7 +225,8 @@
}

TEST_F(GeolocationServiceTest, PermissionDeniedSync) {
- CreateEmbeddedFrameAndGeolocationService(/*allow_via_feature_policy=*/true);
+ CreateEmbeddedFrameAndGeolocationService(
+ /*allow_via_permissions_policy=*/true);
permission_manager()->SetRequestCallback(
base::BindRepeating([](PermissionCallback callback) {
std::move(callback).Run(PermissionStatus::DENIED);
@@ -243,7 +248,8 @@
}

TEST_F(GeolocationServiceTest, PermissionGrantedAsync) {
- CreateEmbeddedFrameAndGeolocationService(/*allow_via_feature_policy=*/true);
+ CreateEmbeddedFrameAndGeolocationService(
+ /*allow_via_permissions_policy=*/true);
permission_manager()->SetRequestId(42);
permission_manager()->SetRequestCallback(
base::BindRepeating([](PermissionCallback permission_callback) {
@@ -273,7 +279,8 @@
}

TEST_F(GeolocationServiceTest, PermissionDeniedAsync) {
- CreateEmbeddedFrameAndGeolocationService(/*allow_via_feature_policy=*/true);
+ CreateEmbeddedFrameAndGeolocationService(
+ /*allow_via_permissions_policy=*/true);
permission_manager()->SetRequestId(42);
permission_manager()->SetRequestCallback(
base::BindRepeating([](PermissionCallback permission_callback) {
@@ -298,7 +305,8 @@
}

TEST_F(GeolocationServiceTest, ServiceClosedBeforePermissionResponse) {
- CreateEmbeddedFrameAndGeolocationService(/*allow_via_feature_policy=*/true);
+ CreateEmbeddedFrameAndGeolocationService(
+ /*allow_via_permissions_policy=*/true);
permission_manager()->SetRequestId(42);
mojo::Remote<Geolocation> geolocation;
service_remote()->CreateGeolocation(
diff --git a/content/browser/media/media_devices_permission_checker.cc b/content/browser/media/media_devices_permission_checker.cc
index 3ed76b0..ff5b6c6 100644
--- a/content/browser/media/media_devices_permission_checker.cc
+++ b/content/browser/media/media_devices_permission_checker.cc
@@ -43,11 +43,11 @@
url::Origin origin = frame_host->GetLastCommittedOrigin();
bool audio_permission = delegate->CheckMediaAccessPermission(
frame_host, origin, blink::mojom::MediaStreamType::DEVICE_AUDIO_CAPTURE);
- bool mic_feature_policy = true;
- bool camera_feature_policy = true;
- mic_feature_policy = frame_host->IsFeatureEnabled(
+ bool mic_permissions_policy = true;
+ bool camera_permissions_policy = true;
+ mic_permissions_policy = frame_host->IsFeatureEnabled(
blink::mojom::PermissionsPolicyFeature::kMicrophone);
- camera_feature_policy = frame_host->IsFeatureEnabled(
+ camera_permissions_policy = frame_host->IsFeatureEnabled(
blink::mojom::PermissionsPolicyFeature::kCamera);

MediaDevicesManager::BoolDeviceTypes result;
@@ -63,7 +63,7 @@
result[static_cast<size_t>(MediaDeviceType::MEDIA_AUDIO_INPUT)] =
requested_device_types[static_cast<size_t>(
MediaDeviceType::MEDIA_AUDIO_INPUT)] &&
- audio_permission && mic_feature_policy;
+ audio_permission && mic_permissions_policy;

// Camera.
result[static_cast<size_t>(MediaDeviceType::MEDIA_VIDEO_INPUT)] =
@@ -72,7 +72,7 @@
delegate->CheckMediaAccessPermission(
frame_host, origin,
blink::mojom::MediaStreamType::DEVICE_VIDEO_CAPTURE) &&
- camera_feature_policy;
+ camera_permissions_policy;

return result;
}
diff --git a/content/browser/renderer_host/frame_tree_node.cc b/content/browser/renderer_host/frame_tree_node.cc
index defe1e5..4462914d 100644
--- a/content/browser/renderer_host/frame_tree_node.cc
+++ b/content/browser/renderer_host/frame_tree_node.cc
@@ -477,7 +477,7 @@
}

UpdateFramePolicyHeaders(new_frame_policy.sandbox_flags,
- replication_state_->feature_policy_header);
+ replication_state_->permissions_policy_header);
return did_change_flags || did_change_container_policy ||
did_change_required_document_policy || did_change_document_access;
}
@@ -733,8 +733,8 @@
network::mojom::WebSandboxFlags sandbox_flags,
const blink::ParsedPermissionsPolicy& parsed_header) {
bool changed = false;
- if (replication_state_->feature_policy_header != parsed_header) {
- replication_state_->feature_policy_header = parsed_header;
+ if (replication_state_->permissions_policy_header != parsed_header) {
+ replication_state_->permissions_policy_header = parsed_header;
changed = true;
}
// TODO(iclelland): Kill the renderer if sandbox flags is not a subset of the
diff --git a/content/browser/renderer_host/navigator_unittest.cc b/content/browser/renderer_host/navigator_unittest.cc
index ed4cbea44..0d10892 100644
--- a/content/browser/renderer_host/navigator_unittest.cc
+++ b/content/browser/renderer_host/navigator_unittest.cc
@@ -1442,18 +1442,18 @@
contents()->NavigateAndCommit(kUrl1);

// Check the permissions policy before navigation.
- const blink::PermissionsPolicy* original_feature_policy =
- main_test_rfh()->feature_policy();
- ASSERT_TRUE(original_feature_policy);
+ const blink::PermissionsPolicy* original_permissions_policy =
+ main_test_rfh()->permissions_policy();
+ ASSERT_TRUE(original_permissions_policy);

// Navigate to the new URL.
contents()->NavigateAndCommit(kUrl2);

// Check the permissions policy after navigation.
- const blink::PermissionsPolicy* final_feature_policy =
- main_test_rfh()->feature_policy();
- ASSERT_TRUE(final_feature_policy);
- ASSERT_NE(original_feature_policy, final_feature_policy);
+ const blink::PermissionsPolicy* final_permissions_policy =
+ main_test_rfh()->permissions_policy();
+ ASSERT_TRUE(final_permissions_policy);
+ ASSERT_NE(original_permissions_policy, final_permissions_policy);
}

// Permissions Policy: Test that the permissions policy is not reset when
@@ -1465,17 +1465,17 @@
contents()->NavigateAndCommit(kUrl1);

// Check the permissions policy before navigation.
- const blink::PermissionsPolicy* original_feature_policy =
- main_test_rfh()->feature_policy();
- ASSERT_TRUE(original_feature_policy);
+ const blink::PermissionsPolicy* original_permissions_policy =
+ main_test_rfh()->permissions_policy();
+ ASSERT_TRUE(original_permissions_policy);

// Navigate to the new URL.
contents()->NavigateAndCommit(kUrl2);

// Check the permissions policy after navigation.
- const blink::PermissionsPolicy* final_feature_policy =
- main_test_rfh()->feature_policy();
- ASSERT_EQ(original_feature_policy, final_feature_policy);
+ const blink::PermissionsPolicy* final_permissions_policy =
+ main_test_rfh()->permissions_policy();
+ ASSERT_EQ(original_permissions_policy, final_permissions_policy);
}

// Permissions Policy: Test that the permissions policy is set correctly when
@@ -1491,10 +1491,10 @@
contents()->GetMainFrame()->AppendChild("child");
NavigationSimulator::NavigateAndCommitFromDocument(kUrl2, subframe_rfh);

- const blink::PermissionsPolicy* subframe_feature_policy =
- subframe_rfh->feature_policy();
- ASSERT_TRUE(subframe_feature_policy);
- ASSERT_FALSE(subframe_feature_policy->GetOriginForTest().opaque());
+ const blink::PermissionsPolicy* subframe_permissions_policy =
+ subframe_rfh->permissions_policy();
+ ASSERT_TRUE(subframe_permissions_policy);
+ ASSERT_FALSE(subframe_permissions_policy->GetOriginForTest().opaque());
}

TEST_F(NavigatorTest, TwoNavigationsRacingCommit) {
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index af6ba9c..8080801 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -715,7 +715,7 @@
if (!parent)
return network::mojom::TrustTokenRedemptionPolicy::kPotentiallyPermit;

- const blink::PermissionsPolicy* parent_policy = parent->feature_policy();
+ const blink::PermissionsPolicy* parent_policy = parent->permissions_policy();
blink::ParsedPermissionsPolicy container_policy =
commit_params.frame_policy.container_policy;

@@ -2768,7 +2768,7 @@
// local) when initializing child's security context, so the update to
// proxies is needed.
frame_tree_node()->UpdateFramePolicyHeaders(active_sandbox_flags_,
- feature_policy_header_);
+ permissions_policy_header_);
// Document policy's inheritance from parent frame's required document
// policy is done at |HTMLFrameOwnerElement::UpdateRequiredPolicy|. Parent
// frame owns both parent's required document policy and child frame's frame
@@ -3977,8 +3977,8 @@

bool RenderFrameHostImpl::IsFeatureEnabled(
blink::mojom::PermissionsPolicyFeature feature) {
- return feature_policy_ && feature_policy_->IsFeatureEnabledForOrigin(
- feature, GetLastCommittedOrigin());
+ return permissions_policy_ && permissions_policy_->IsFeatureEnabledForOrigin(
+ feature, GetLastCommittedOrigin());
}

void RenderFrameHostImpl::ViewSource() {
@@ -7762,10 +7762,10 @@
void RenderFrameHostImpl::ResetFeaturePolicy() {
RenderFrameHostImpl* parent_frame_host = GetParent();
const blink::PermissionsPolicy* parent_policy =
- parent_frame_host ? parent_frame_host->feature_policy() : nullptr;
+ parent_frame_host ? parent_frame_host->permissions_policy() : nullptr;
blink::ParsedPermissionsPolicy container_policy =
frame_tree_node()->effective_frame_policy().container_policy;
- feature_policy_ = blink::PermissionsPolicy::CreateFromParentPolicy(
+ permissions_policy_ = blink::PermissionsPolicy::CreateFromParentPolicy(
parent_policy, container_policy, last_committed_origin_);
}

@@ -8934,8 +8934,8 @@

ResetFeaturePolicy();
active_sandbox_flags_ = params.sandbox_flags;
- feature_policy_header_ = params.feature_policy_header;
- feature_policy_->SetHeaderPolicy(params.feature_policy_header);
+ permissions_policy_header_ = params.permissions_policy_header;
+ permissions_policy_->SetHeaderPolicy(params.permissions_policy_header);
document_policy_ = blink::DocumentPolicy::CreateWithHeaderPolicy({
params.document_policy_header, // document_policy_header
{}, // endpoint_map
diff --git a/content/browser/renderer_host/render_frame_host_impl.h b/content/browser/renderer_host/render_frame_host_impl.h
index 1c484f26..8b5db36 100644
--- a/content/browser/renderer_host/render_frame_host_impl.h
+++ b/content/browser/renderer_host/render_frame_host_impl.h
@@ -1091,8 +1091,8 @@

// Returns the permissions policy which should be enforced on this
// RenderFrame.
- const blink::PermissionsPolicy* feature_policy() const {
- return feature_policy_.get();
+ const blink::PermissionsPolicy* permissions_policy() const {
+ return permissions_policy_.get();
}

void ClearFocusedElement();
@@ -2493,7 +2493,7 @@
void SetLastCommittedOrigin(const url::Origin& origin);

// Set the |last_committed_origin_|, |isolation_info_|, and
- // |feature_policy_| of |this| frame, inheriting the origin from
+ // |permissions_policy_| of |this| frame, inheriting the origin from
// |new_frame_creator| as appropriate (e.g. depending on whether |this| frame
// should be sandboxed / should have an opaque origin instead).
void SetOriginDependentStateOfNewFrame(const url::Origin& new_frame_creator);
@@ -3179,10 +3179,10 @@
// Parsed permissions policy header. It is parsed from blink, received during
// DidCommitProvisionalLoad. This is constant during the whole lifetime of
// this document.
- blink::ParsedPermissionsPolicy feature_policy_header_;
+ blink::ParsedPermissionsPolicy permissions_policy_header_;

// Tracks the permissions policy which has been set on this frame.
- std::unique_ptr<blink::PermissionsPolicy> feature_policy_;
+ std::unique_ptr<blink::PermissionsPolicy> permissions_policy_;

// Tracks the document policy which has been set on this frame.
std::unique_ptr<blink::DocumentPolicy> document_policy_;
diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
index 3a747d89..973bc0e 100644
--- a/content/browser/renderer_host/render_frame_host_manager.cc
+++ b/content/browser/renderer_host/render_frame_host_manager.cc
@@ -472,7 +472,8 @@
for (const auto& pair : proxy_hosts_) {
pair.second->GetAssociatedRemoteFrame()->DidSetFramePolicyHeaders(
frame_tree_node_->active_sandbox_flags(),
- frame_tree_node_->current_replication_state().feature_policy_header);
+ frame_tree_node_->current_replication_state()
+ .permissions_policy_header);
}
}

diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc
index 843ad91..496b8f8 100644
--- a/content/browser/site_per_process_browsertest.cc
+++ b/content/browser/site_per_process_browsertest.cc
@@ -9120,7 +9120,7 @@
EXPECT_EQ(CreateParsedPermissionsPolicy(
{blink::mojom::PermissionsPolicyFeature::kGeolocation},
{url.GetOrigin()}),
- root->current_replication_state().feature_policy_header);
+ root->current_replication_state().permissions_policy_header);
}

IN_PROC_BROWSER_TEST_P(SitePerProcessBrowserTest,
@@ -9138,7 +9138,7 @@
{blink::mojom::PermissionsPolicyFeature::kGeolocation,
blink::mojom::PermissionsPolicyFeature::kPayment},
{start_url.GetOrigin()}),
- root->current_replication_state().feature_policy_header);
+ root->current_replication_state().permissions_policy_header);

// When the main frame navigates to a page with a new policy, it should
// overwrite the old one.
@@ -9146,12 +9146,13 @@
EXPECT_EQ(CreateParsedPermissionsPolicyMatchesAll(
{blink::mojom::PermissionsPolicyFeature::kGeolocation,
blink::mojom::PermissionsPolicyFeature::kPayment}),
- root->current_replication_state().feature_policy_header);
+ root->current_replication_state().permissions_policy_header);

// When the main frame navigates to a page without a policy, the replicated
// policy header should be cleared.
EXPECT_TRUE(NavigateToURL(shell(), second_nav_url));
- EXPECT_TRUE(root->current_replication_state().feature_policy_header.empty());
+ EXPECT_TRUE(
+ root->current_replication_state().permissions_policy_header.empty());
}

IN_PROC_BROWSER_TEST_P(SitePerProcessBrowserTest,
@@ -9169,7 +9170,7 @@
{blink::mojom::PermissionsPolicyFeature::kGeolocation,
blink::mojom::PermissionsPolicyFeature::kPayment},
{start_url.GetOrigin()}),
- root->current_replication_state().feature_policy_header);
+ root->current_replication_state().permissions_policy_header);

// When the main frame navigates to a page with a new policy, it should
// overwrite the old one.
@@ -9177,12 +9178,13 @@
EXPECT_EQ(CreateParsedPermissionsPolicyMatchesAll(
{blink::mojom::PermissionsPolicyFeature::kGeolocation,
blink::mojom::PermissionsPolicyFeature::kPayment}),
- root->current_replication_state().feature_policy_header);
+ root->current_replication_state().permissions_policy_header);

// When the main frame navigates to a page without a policy, the replicated
// policy header should be cleared.
EXPECT_TRUE(NavigateToURL(shell(), second_nav_url));
- EXPECT_TRUE(root->current_replication_state().feature_policy_header.empty());
+ EXPECT_TRUE(
+ root->current_replication_state().permissions_policy_header.empty());
}

// Test that the replicated permissions policy header is correct in subframes as
@@ -9202,14 +9204,14 @@
{blink::mojom::PermissionsPolicyFeature::kGeolocation,
blink::mojom::PermissionsPolicyFeature::kPayment},
{main_url.GetOrigin(), GURL("http://example.com/")}),
- root->current_replication_state().feature_policy_header);
+ root->current_replication_state().permissions_policy_header);
EXPECT_EQ(1UL, root->child_count());
EXPECT_EQ(
CreateParsedPermissionsPolicy(
{blink::mojom::PermissionsPolicyFeature::kGeolocation,
blink::mojom::PermissionsPolicyFeature::kPayment},
{main_url.GetOrigin()}),
- root->child_at(0)->current_replication_state().feature_policy_header);
+ root->child_at(0)->current_replication_state().permissions_policy_header);

// Navigate the iframe cross-site.
EXPECT_TRUE(NavigateToURLFromRenderer(root->child_at(0), first_nav_url));
@@ -9217,13 +9219,13 @@
CreateParsedPermissionsPolicyMatchesAll(
{blink::mojom::PermissionsPolicyFeature::kGeolocation,
blink::mojom::PermissionsPolicyFeature::kPayment}),
- root->child_at(0)->current_replication_state().feature_policy_header);
+ root->child_at(0)->current_replication_state().permissions_policy_header);

// Navigate the iframe to another location, this one with no policy header
EXPECT_TRUE(NavigateToURLFromRenderer(root->child_at(0), second_nav_url));
EXPECT_TRUE(root->child_at(0)
->current_replication_state()
- .feature_policy_header.empty());
+ .permissions_policy_header.empty());

// Navigate the iframe back to a page with a policy
EXPECT_TRUE(NavigateToURLFromRenderer(root->child_at(0), first_nav_url));
@@ -9231,7 +9233,7 @@
CreateParsedPermissionsPolicyMatchesAll(
{blink::mojom::PermissionsPolicyFeature::kGeolocation,
blink::mojom::PermissionsPolicyFeature::kPayment}),
- root->child_at(0)->current_replication_state().feature_policy_header);
+ root->child_at(0)->current_replication_state().permissions_policy_header);
}

// Test that the replicated permissions policy header is correct in remote
@@ -9248,11 +9250,12 @@
EXPECT_TRUE(NavigateToURL(shell(), main_url));

FrameTreeNode* root = web_contents()->GetFrameTree()->root();
- EXPECT_TRUE(root->current_replication_state().feature_policy_header.empty());
+ EXPECT_TRUE(
+ root->current_replication_state().permissions_policy_header.empty());
EXPECT_EQ(2UL, root->child_count());
EXPECT_TRUE(root->child_at(1)
->current_replication_state()
- .feature_policy_header.empty());
+ .permissions_policy_header.empty());

// Navigate the iframe to a page with a policy, and a nested cross-site iframe
// (to the same site as a root->child_at(1) so that the render process already
@@ -9262,7 +9265,7 @@
CreateParsedPermissionsPolicyMatchesNone(
{blink::mojom::PermissionsPolicyFeature::kGeolocation,
blink::mojom::PermissionsPolicyFeature::kPayment}),
- root->child_at(1)->current_replication_state().feature_policy_header);
+ root->child_at(1)->current_replication_state().permissions_policy_header);

EXPECT_EQ(1UL, root->child_at(1)->child_count());

@@ -9281,7 +9284,7 @@
EXPECT_TRUE(NavigateToURLFromRenderer(root->child_at(1), second_nav_url));
EXPECT_TRUE(root->child_at(1)
->current_replication_state()
- .feature_policy_header.empty());
+ .permissions_policy_header.empty());
EXPECT_EQ(1UL, root->child_at(1)->child_count());

// Ask the deepest iframe to report the enabled state of the geolocation
@@ -9310,7 +9313,8 @@
EXPECT_TRUE(NavigateToURL(shell(), main_url));

FrameTreeNode* root = web_contents()->GetFrameTree()->root();
- EXPECT_TRUE(root->current_replication_state().feature_policy_header.empty());
+ EXPECT_TRUE(
+ root->current_replication_state().permissions_policy_header.empty());
EXPECT_EQ(1UL, root->child_count());
// Verify that the child frame is sandboxed with an opaque origin.
EXPECT_TRUE(root->child_at(0)
@@ -9371,7 +9375,8 @@
EXPECT_TRUE(NavigateToURL(shell(), main_url));

FrameTreeNode* root = web_contents()->GetFrameTree()->root();
- EXPECT_TRUE(root->current_replication_state().feature_policy_header.empty());
+ EXPECT_TRUE(
+ root->current_replication_state().permissions_policy_header.empty());
EXPECT_EQ(1UL, root->child_count());
// Verify that the child frame has an opaque origin.
EXPECT_TRUE(root->child_at(0)
diff --git a/content/common/frame_replication_state.mojom b/content/common/frame_replication_state.mojom
index d44e82d..cbebf27 100644
--- a/content/common/frame_replication_state.mojom
+++ b/content/common/frame_replication_state.mojom
@@ -55,7 +55,8 @@

// Parsed permissions policy header. May be empty if no header was sent with
// the document.
- array<blink.mojom.ParsedPermissionsPolicyDeclaration> feature_policy_header;
+ array<blink.mojom.ParsedPermissionsPolicyDeclaration>
+ permissions_policy_header;

// Contains the currently active sandbox flags for this frame, including flags
// inherited from parent frames, the currently active flags from the <iframe>
diff --git a/content/common/navigation_client.mojom b/content/common/navigation_client.mojom
index 242d81b..cd7a4cf 100644
--- a/content/common/navigation_client.mojom
+++ b/content/common/navigation_client.mojom
@@ -135,7 +135,8 @@
// https://w3c.github.io/webappsec-permissions-policy/#permissions-policy-http-header-field
// Note: For backward compatibility, this field also contains
// 'Feature-Policy' headers applied to the document.
- array<blink.mojom.ParsedPermissionsPolicyDeclaration> feature_policy_header;
+ array<blink.mojom.ParsedPermissionsPolicyDeclaration>
+ permissions_policy_header;

// The 'Document-Policy' headers applied to the document.
// https://w3c.github.io/webappsec-permissions-policy/document-policy.html
diff --git a/content/public/test/fake_remote_frame.h b/content/public/test/fake_remote_frame.h
index 214e6374..f633e43 100644
--- a/content/public/test/fake_remote_frame.h
+++ b/content/public/test/fake_remote_frame.h
@@ -78,7 +78,7 @@
void DidSetFramePolicyHeaders(
network::mojom::WebSandboxFlags sandbox_flags,
const std::vector<blink::ParsedPermissionsPolicyDeclaration>&
- parsed_feature_policy) override {}
+ parsed_permissions_policy) override {}
void DidUpdateFramePolicy(const blink::FramePolicy& frame_policy) override {}
void UpdateOpener(
const base::Optional<blink::FrameToken>& opener_frame_token) override;
diff --git a/content/public/test/navigation_simulator.h b/content/public/test/navigation_simulator.h
index ae2c60e..f2be8c7 100644
--- a/content/public/test/navigation_simulator.h
+++ b/content/public/test/navigation_simulator.h
@@ -275,7 +275,7 @@

// Simulate receiving Permissions-Policy headers.
virtual void SetFeaturePolicyHeader(
- blink::ParsedPermissionsPolicy feature_policy_header) = 0;
+ blink::ParsedPermissionsPolicy permissions_policy_header) = 0;

// Provides the contents mime type to be set at commit. It should be
// specified before calling |ReadyToCommit| or |Commit|.
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index b39c521..ef133e4 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -1036,11 +1036,11 @@
WebString::FromUTF8(id));
}

- const base::Optional<std::string>& feature_policy =
- head.origin_policy.value().contents->feature_policy;
- if (feature_policy) {
- navigation_params->origin_policy->feature_policy =
- WebString::FromUTF8(*feature_policy);
+ const base::Optional<std::string>& permissions_policy =
+ head.origin_policy.value().contents->permissions_policy;
+ if (permissions_policy) {
+ navigation_params->origin_policy->permissions_policy =
+ WebString::FromUTF8(*permissions_policy);
}

for (const auto& csp :
@@ -3986,7 +3986,7 @@
blink::WebHistoryCommitType commit_type,
bool should_reset_browser_interface_broker,
network::mojom::WebSandboxFlags sandbox_flags,
- const blink::ParsedPermissionsPolicy& feature_policy_header,
+ const blink::ParsedPermissionsPolicy& permissions_policy_header,
const blink::DocumentPolicyFeatureState& document_policy_header) {
CHECK_EQ(NavigationCommitState::kWillCommit, navigation_commit_state_);
navigation_commit_state_ = NavigationCommitState::kDidCommit;
@@ -4098,7 +4098,7 @@
GetTransitionType(frame_->GetDocumentLoader(), IsMainFrame());

DidCommitNavigationInternal(
- commit_type, transition, sandbox_flags, feature_policy_header,
+ commit_type, transition, sandbox_flags, permissions_policy_header,
document_policy_header,
should_reset_browser_interface_broker
? mojom::DidCommitProvisionalLoadInterfaceParams::New(
@@ -4259,7 +4259,7 @@
same_document_params->is_history_api_navigation = is_history_api_navigation;
DidCommitNavigationInternal(
commit_type, transition, network::mojom::WebSandboxFlags(),
- blink::ParsedPermissionsPolicy(), // feature_policy_header
+ blink::ParsedPermissionsPolicy(), // permissions_policy_header
blink::DocumentPolicyFeatureState(), // document_policy_header
nullptr, // interface_params
std::move(same_document_params),
@@ -4727,7 +4727,7 @@
blink::WebHistoryCommitType commit_type,
ui::PageTransition transition,
network::mojom::WebSandboxFlags sandbox_flags,
- const blink::ParsedPermissionsPolicy& feature_policy_header,
+ const blink::ParsedPermissionsPolicy& permissions_policy_header,
const blink::DocumentPolicyFeatureState& document_policy_header,
const base::Optional<base::UnguessableToken>& embedding_token) {
WebDocumentLoader* document_loader = frame_->GetDocumentLoader();
@@ -4778,7 +4778,7 @@
params->origin = frame_origin;

params->sandbox_flags = sandbox_flags;
- params->feature_policy_header = feature_policy_header;
+ params->permissions_policy_header = permissions_policy_header;
params->document_policy_header = document_policy_header;

params->insecure_request_policy = frame_->GetInsecureRequestPolicy();
@@ -5003,7 +5003,7 @@
blink::WebHistoryCommitType commit_type,
ui::PageTransition transition,
network::mojom::WebSandboxFlags sandbox_flags,
- const blink::ParsedPermissionsPolicy& feature_policy_header,
+ const blink::ParsedPermissionsPolicy& permissions_policy_header,
const blink::DocumentPolicyFeatureState& document_policy_header,
mojom::DidCommitProvisionalLoadInterfaceParamsPtr interface_params,
mojom::DidCommitSameDocumentNavigationParamsPtr same_document_params,
@@ -5020,7 +5020,7 @@
// after the browser process has already been informed of the provisional
// load committing.
auto params = MakeDidCommitProvisionalLoadParams(
- commit_type, transition, sandbox_flags, feature_policy_header,
+ commit_type, transition, sandbox_flags, permissions_policy_header,
document_policy_header, embedding_token);

if (same_document_params) {
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index d1b2482..2fe4708 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -547,7 +547,7 @@
blink::WebHistoryCommitType commit_type,
bool should_reset_browser_interface_broker,
network::mojom::WebSandboxFlags sandbox_flags,
- const blink::ParsedPermissionsPolicy& feature_policy_header,
+ const blink::ParsedPermissionsPolicy& permissions_policy_header,
const blink::DocumentPolicyFeatureState& document_policy_header) override;
void DidCommitDocumentReplacementNavigation(
blink::WebDocumentLoader* document_loader) override;
@@ -1024,7 +1024,7 @@
blink::WebHistoryCommitType commit_type,
ui::PageTransition transition,
network::mojom::WebSandboxFlags sandbox_flags,
- const blink::ParsedPermissionsPolicy& feature_policy_header,
+ const blink::ParsedPermissionsPolicy& permissions_policy_header,
const blink::DocumentPolicyFeatureState& document_policy_header,
const base::Optional<base::UnguessableToken>& embedding_token);

@@ -1049,7 +1049,7 @@
blink::WebHistoryCommitType commit_type,
ui::PageTransition transition,
network::mojom::WebSandboxFlags sandbox_flags,
- const blink::ParsedPermissionsPolicy& feature_policy_header,
+ const blink::ParsedPermissionsPolicy& permissions_policy_header,
const blink::DocumentPolicyFeatureState& document_policy_header,
mojom::DidCommitProvisionalLoadInterfaceParamsPtr interface_params,
mojom::DidCommitSameDocumentNavigationParamsPtr same_document_params,
diff --git a/content/renderer/render_frame_proxy.cc b/content/renderer/render_frame_proxy.cc
index acf46d3..1937eae 100644
--- a/content/renderer/render_frame_proxy.cc
+++ b/content/renderer/render_frame_proxy.cc
@@ -258,7 +258,8 @@
web_frame_->SetReplicatedInsecureNavigationsSet(
state->insecure_navigations_set);
web_frame_->SetReplicatedAdFrameType(state->ad_frame_type);
- web_frame_->SetReplicatedFeaturePolicyHeader(state->feature_policy_header);
+ web_frame_->SetReplicatedFeaturePolicyHeader(
+ state->permissions_policy_header);
if (state->has_active_user_gesture) {
// TODO(crbug.com/1087963): This should be hearing about sticky activations
// and setting those (as well as the active one?). But the call to
diff --git a/content/test/navigation_simulator_impl.cc b/content/test/navigation_simulator_impl.cc
index 4446480..2843826 100644
--- a/content/test/navigation_simulator_impl.cc
+++ b/content/test/navigation_simulator_impl.cc
@@ -905,10 +905,10 @@
}

void NavigationSimulatorImpl::SetFeaturePolicyHeader(
- blink::ParsedPermissionsPolicy feature_policy_header) {
+ blink::ParsedPermissionsPolicy permissions_policy_header) {
CHECK_LE(state_, STARTED) << "The Feature-Policy headers cannot be set after "
"the navigation has committed or failed";
- feature_policy_header_ = std::move(feature_policy_header);
+ permissions_policy_header_ = std::move(permissions_policy_header);
}

void NavigationSimulatorImpl::SetContentsMimeType(
@@ -1358,7 +1358,7 @@

CHECK(same_document || request_);

- params->feature_policy_header = std::move(feature_policy_header_);
+ params->permissions_policy_header = std::move(permissions_policy_header_);

// Simulate Blink assigning a item sequence number and document sequence
// number to the navigation.
diff --git a/content/test/navigation_simulator_impl.h b/content/test/navigation_simulator_impl.h
index 2bc9543..08e51a2 100644
--- a/content/test/navigation_simulator_impl.h
+++ b/content/test/navigation_simulator_impl.h
@@ -88,7 +88,7 @@
void SetIsSignedExchangeInnerResponse(
bool is_signed_exchange_inner_response) override;
void SetFeaturePolicyHeader(
- blink::ParsedPermissionsPolicy feature_policy_header) override;
+ blink::ParsedPermissionsPolicy permissions_policy_header) override;
void SetContentsMimeType(const std::string& contents_mime_type) override;
void SetResponseHeaders(
scoped_refptr<net::HttpResponseHeaders> response_headers) override;
@@ -286,7 +286,7 @@
browser_interface_broker_receiver_;
std::string contents_mime_type_;
scoped_refptr<net::HttpResponseHeaders> response_headers_;
- blink::ParsedPermissionsPolicy feature_policy_header_;
+ blink::ParsedPermissionsPolicy permissions_policy_header_;
network::mojom::CSPDisposition should_check_main_world_csp_ =
network::mojom::CSPDisposition::CHECK;
net::HttpResponseInfo::ConnectionInfo http_connection_info_ =
diff --git a/services/network/origin_policy/origin_policy_parser.cc b/services/network/origin_policy/origin_policy_parser.cc
index f959979..4849c23 100644
--- a/services/network/origin_policy/origin_policy_parser.cc
+++ b/services/network/origin_policy/origin_policy_parser.cc
@@ -91,7 +91,7 @@
const std::string* policy = features.FindStringKey("policy");

if (policy) {
- policy_contents_->feature_policy = *policy;
+ policy_contents_->permissions_policy = *policy;
}
}

diff --git a/services/network/origin_policy/origin_policy_parser_unittest.cc b/services/network/origin_policy/origin_policy_parser_unittest.cc
index 388a046..3a3d159f 100644
--- a/services/network/origin_policy/origin_policy_parser_unittest.cc
+++ b/services/network/origin_policy/origin_policy_parser_unittest.cc
@@ -17,7 +17,7 @@

void AssertEmptyPolicy(
const network::OriginPolicyContentsPtr& policy_contents) {
- ASSERT_FALSE(policy_contents->feature_policy.has_value());
+ ASSERT_FALSE(policy_contents->permissions_policy.has_value());
ASSERT_EQ(0u, policy_contents->ids.size());
ASSERT_EQ(0u, policy_contents->content_security_policies.size());
ASSERT_EQ(0u, policy_contents->content_security_policies_report_only.size());
@@ -452,7 +452,7 @@
} )");

ASSERT_EQ("geolocation 'self' http://maps.google.com",
- policy_contents->feature_policy);
+ policy_contents->permissions_policy);
}

TEST(OriginPolicyParser, FeatureTwo) {
@@ -466,7 +466,7 @@

ASSERT_EQ(
"geolocation 'self' http://maps.google.com; camera https://example.com",
- policy_contents->feature_policy);
+ policy_contents->permissions_policy);
}

TEST(OriginPolicyParser, FeatureTwoFeatures) {
@@ -477,7 +477,7 @@
"features": { "policy": "camera https://example.com" }
} )");

- ASSERT_EQ("camera https://example.com", policy_contents->feature_policy);
+ ASSERT_EQ("camera https://example.com", policy_contents->permissions_policy);
}

TEST(OriginPolicyParser, FeatureTwoPolicy) {
@@ -490,7 +490,7 @@
}
} )");

- ASSERT_EQ("camera https://example.com", policy_contents->feature_policy);
+ ASSERT_EQ("camera https://example.com", policy_contents->permissions_policy);
}

// At this level we don't validate the syntax, so commas get passed through.
@@ -507,7 +507,7 @@

ASSERT_EQ(
"geolocation 'self' http://maps.google.com, camera https://example.com",
- policy_contents->feature_policy);
+ policy_contents->permissions_policy);
}

// Similarly, complete garbage will be passed through; this is expected.
@@ -520,7 +520,7 @@
}
} )");

- ASSERT_EQ("Lorem ipsum! dolor sit amet", policy_contents->feature_policy);
+ ASSERT_EQ("Lorem ipsum! dolor sit amet", policy_contents->permissions_policy);
}

TEST(OriginPolicyParser, FeatureNonDict) {
@@ -530,7 +530,7 @@
"features": "geolocation 'self' http://maps.google.com"
} )");

- ASSERT_FALSE(policy_contents->feature_policy.has_value());
+ ASSERT_FALSE(policy_contents->permissions_policy.has_value());
}

TEST(OriginPolicyParser, FeatureNonString) {
@@ -542,7 +542,7 @@
}
} )");

- ASSERT_FALSE(policy_contents->feature_policy.has_value());
+ ASSERT_FALSE(policy_contents->permissions_policy.has_value());
}

} // namespace network
diff --git a/services/network/public/cpp/network_ipc_param_traits.h b/services/network/public/cpp/network_ipc_param_traits.h
index 103d59d..647824d2 100644
--- a/services/network/public/cpp/network_ipc_param_traits.h
+++ b/services/network/public/cpp/network_ipc_param_traits.h
@@ -98,7 +98,7 @@

IPC_STRUCT_TRAITS_BEGIN(network::OriginPolicyContents)
IPC_STRUCT_TRAITS_MEMBER(ids)
- IPC_STRUCT_TRAITS_MEMBER(feature_policy)
+ IPC_STRUCT_TRAITS_MEMBER(permissions_policy)
IPC_STRUCT_TRAITS_MEMBER(content_security_policies)
IPC_STRUCT_TRAITS_MEMBER(content_security_policies_report_only)
IPC_STRUCT_TRAITS_END()
diff --git a/services/network/public/cpp/origin_policy.cc b/services/network/public/cpp/origin_policy.cc
index e1d3d831..fb97ccd 100644
--- a/services/network/public/cpp/origin_policy.cc
+++ b/services/network/public/cpp/origin_policy.cc
@@ -24,11 +24,11 @@

OriginPolicyContents::OriginPolicyContents(
const std::vector<std::string>& ids,
- const base::Optional<std::string>& feature_policy,
+ const base::Optional<std::string>& permissions_policy,
const std::vector<std::string>& content_security_policies,
const std::vector<std::string>& content_security_policies_report_only)
: ids(ids),
- feature_policy(feature_policy),
+ permissions_policy(permissions_policy),
content_security_policies(content_security_policies),
content_security_policies_report_only(
content_security_policies_report_only) {}
@@ -37,7 +37,7 @@
const OriginPolicyContents& other) = default;

bool OriginPolicyContents::operator==(const OriginPolicyContents& other) const {
- return ids == other.ids && feature_policy == other.feature_policy &&
+ return ids == other.ids && permissions_policy == other.permissions_policy &&
content_security_policies == other.content_security_policies &&
content_security_policies_report_only ==
other.content_security_policies_report_only;
diff --git a/services/network/public/cpp/origin_policy.h b/services/network/public/cpp/origin_policy.h
index 6845e40..f772bc5 100644
--- a/services/network/public/cpp/origin_policy.h
+++ b/services/network/public/cpp/origin_policy.h
@@ -73,7 +73,7 @@
// https://w3c.github.io/webappsec-permissions-policy/
// This is stored as a raw string, so it is not guaranteed to be an actual
// permissions policy; Blink will attempt to parse and apply it.
- base::Optional<std::string> feature_policy;
+ base::Optional<std::string> permissions_policy;

// These two fields together represent the CSP that should be applied to the
// origin, based on the origin policy. They are stored as raw strings, so are
diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party/blink/common/client_hints/client_hints.cc
index 2743b0f..833602b 100644
--- a/third_party/blink/common/client_hints/client_hints.cc
+++ b/third_party/blink/common/client_hints/client_hints.cc
@@ -133,7 +133,7 @@

// Add a list of Client Hints headers to be removed to the output vector, based
// on PermissionsPolicy and the url's origin.
-void FindClientHintsToRemove(const PermissionsPolicy* feature_policy,
+void FindClientHintsToRemove(const PermissionsPolicy* permissions_policy,
const GURL& url,
std::vector<std::string>* removed_headers) {
DCHECK(removed_headers);
@@ -148,11 +148,11 @@
// * Permissions policy is null (we're in a sync XHR case) and the hint is
// not sent by default.
// * Permissions policy exists and doesn't allow for the hint.
- if ((!feature_policy &&
+ if ((!permissions_policy &&
!IsClientHintSentByDefault(
static_cast<network::mojom::WebClientHintsType>(i))) ||
- (feature_policy &&
- !feature_policy->IsFeatureEnabledForOrigin(
+ (permissions_policy &&
+ !permissions_policy->IsFeatureEnabledForOrigin(
blink::kClientHintsFeaturePolicyMapping[i], origin))) {
removed_headers->push_back(blink::kClientHintsHeaderMapping[i]);
}
diff --git a/third_party/blink/public/common/client_hints/client_hints.h b/third_party/blink/public/common/client_hints/client_hints.h
index 5588d6f..7e81fdc 100644
--- a/third_party/blink/public/common/client_hints/client_hints.h
+++ b/third_party/blink/public/common/client_hints/client_hints.h
@@ -67,7 +67,7 @@
// Add a list of Client Hints headers to be removed to the output vector, based
// on Permissions Policy and the url's origin.
BLINK_COMMON_EXPORT void FindClientHintsToRemove(
- const PermissionsPolicy* feature_policy,
+ const PermissionsPolicy* permissions_policy,
const GURL& url,
std::vector<std::string>* removed_headers);

diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h
index bdd205a..0d065ec 100644
--- a/third_party/blink/public/web/web_local_frame_client.h
+++ b/third_party/blink/public/web/web_local_frame_client.h
@@ -365,7 +365,7 @@
WebHistoryCommitType commit_type,
bool should_reset_browser_interface_broker,
network::mojom::WebSandboxFlags sandbox_flags,
- const ParsedPermissionsPolicy& feature_policy_header,
+ const ParsedPermissionsPolicy& permissions_policy_header,
const DocumentPolicyFeatureState& document_policy_header) {}

// A new document has just been committed as a result of evaluating
diff --git a/third_party/blink/public/web/web_origin_policy.h b/third_party/blink/public/web/web_origin_policy.h
index c2628b1..e643168 100644
--- a/third_party/blink/public/web/web_origin_policy.h
+++ b/third_party/blink/public/web/web_origin_policy.h
@@ -21,7 +21,7 @@

// The permissions policy that is dictated by the origin policy, if any.
// https://w3c.github.io/webappsec-permissions-policy/
- WebString feature_policy;
+ WebString permissions_policy;

// These two fields together represent the CSP that should be applied to the
// origin, based on the origin policy.
diff --git a/third_party/blink/renderer/build/scripts/make_policy_helper.py b/third_party/blink/renderer/build/scripts/make_policy_helper.py
index 33514f0..eecc81c 100644
--- a/third_party/blink/renderer/build/scripts/make_policy_helper.py
+++ b/third_party/blink/renderer/build/scripts/make_policy_helper.py
@@ -15,46 +15,48 @@
super(PermissionsPolicyFeatureWriter,
self).__init__(json5_file_path, output_dir)
runtime_features = []
- feature_policy_features = []
+ permissions_policy_features = []
# Note: there can be feature with same 'name' attribute in
# document_policy_features and in permissions_policy_features.
# They are supposed to have the same 'depends_on' attribute.
- # However, their feature_policy_name and document_policy_name
+ # However, their permissions_policy_name and document_policy_name
# might be different.
document_policy_features = []

- def to_devtools_enum_format(feature_policy_name):
- """ Convert '-' separated feature_policy_name to cammel case devtool enum name """
- return ''.join(
- [name.capitalize() for name in feature_policy_name.split('-')])
+ def to_devtools_enum_format(permissions_policy_name):
+ """ Convert '-' separated permissions_policy_name to cammel case devtool enum name """
+ return ''.join([
+ name.capitalize()
+ for name in permissions_policy_name.split('-')
+ ])

for feature in self.json5_file.name_dictionaries:
- if feature['feature_policy_name']:
+ if feature['permissions_policy_name']:
feature['devtools_enum_name'] = to_devtools_enum_format(
- feature['feature_policy_name'])
- feature_policy_features.append(feature)
+ feature['permissions_policy_name'])
+ permissions_policy_features.append(feature)
elif feature['document_policy_name']:
document_policy_features.append(feature)
else:
runtime_features.append(feature)

origin_trials_set = origin_trials(runtime_features)
- fp_origin_trial_dependency_map = defaultdict(list)
+ pp_origin_trial_dependency_map = defaultdict(list)
dp_origin_trial_dependency_map = defaultdict(list)
- runtime_to_feature_policy_map = defaultdict(list)
+ runtime_to_permissions_policy_map = defaultdict(list)
runtime_to_document_policy_map = defaultdict(list)
- for feature in feature_policy_features + document_policy_features:
+ for feature in permissions_policy_features + document_policy_features:
for dependency in feature['depends_on']:
if str(dependency) in origin_trials_set:
- if feature['feature_policy_name']:
- fp_origin_trial_dependency_map[feature['name']].append(
+ if feature['permissions_policy_name']:
+ pp_origin_trial_dependency_map[feature['name']].append(
dependency)
else:
dp_origin_trial_dependency_map[feature['name']].append(
dependency)
else:
- if feature['feature_policy_name']:
- runtime_to_feature_policy_map[dependency].append(
+ if feature['permissions_policy_name']:
+ runtime_to_permissions_policy_map[dependency].append(
feature['name'])
else:
runtime_to_document_policy_map[dependency].append(
@@ -62,23 +64,26 @@

self._outputs = {
self.file_basename + '.cc':
- template_expander.use_jinja('templates/' +
- self.file_basename + '.cc.tmpl')(lambda: {
- 'header_guard': self.make_header_guard(
- self._relative_output_dir +
- self.file_basename + '.h'),
- 'input_files': self._input_files,
- 'feature_policy_features': feature_policy_features,
- 'document_policy_features': document_policy_features,
- 'fp_origin_trial_dependency_map':
- fp_origin_trial_dependency_map,
- 'dp_origin_trial_dependency_map':
- dp_origin_trial_dependency_map,
- 'runtime_to_feature_policy_map':
- runtime_to_feature_policy_map,
- 'runtime_to_document_policy_map':
- runtime_to_document_policy_map
- }),
+ template_expander.use_jinja(
+ 'templates/' + self.file_basename + '.cc.tmpl')(lambda: {
+ 'header_guard':
+ self.make_header_guard(self._relative_output_dir + self.
+ file_basename + '.h'),
+ 'input_files':
+ self._input_files,
+ 'permissions_policy_features':
+ permissions_policy_features,
+ 'document_policy_features':
+ document_policy_features,
+ 'pp_origin_trial_dependency_map':
+ pp_origin_trial_dependency_map,
+ 'dp_origin_trial_dependency_map':
+ dp_origin_trial_dependency_map,
+ 'runtime_to_permissions_policy_map':
+ runtime_to_permissions_policy_map,
+ 'runtime_to_document_policy_map':
+ runtime_to_document_policy_map
+ }),
}


diff --git a/third_party/blink/renderer/build/scripts/templates/policy_helper.cc.tmpl b/third_party/blink/renderer/build/scripts/templates/policy_helper.cc.tmpl
index c26823f25..7e99ab6 100644
--- a/third_party/blink/renderer/build/scripts/templates/policy_helper.cc.tmpl
+++ b/third_party/blink/renderer/build/scripts/templates/policy_helper.cc.tmpl
@@ -16,8 +16,8 @@
namespace blink {
namespace {

-{% for feature in feature_policy_features %}
-const char k{{feature.name}}PolicyName[] = "{{feature.feature_policy_name}}";
+{% for feature in permissions_policy_features %}
+const char k{{feature.name}}PolicyName[] = "{{feature.permissions_policy_name}}";
{% endfor %}

} // namespace
@@ -33,13 +33,13 @@
const FeatureNameMap& GetDefaultFeatureNameMap() {
DEFINE_STATIC_LOCAL(FeatureNameMap, default_feature_name_map, ());
if (default_feature_name_map.IsEmpty()) {
- {% for feature in feature_policy_features %}
- {% if not feature.depends_on or feature.name in fp_origin_trial_dependency_map %}
+ {% for feature in permissions_policy_features %}
+ {% if not feature.depends_on or feature.name in pp_origin_trial_dependency_map %}
default_feature_name_map.Set(k{{feature.name}}PolicyName,
mojom::PermissionsPolicyFeature::k{{feature.name}});
{% endif %}
{% endfor %}
- {% for runtime_feature_name, dependent_features in runtime_to_feature_policy_map.items() | sort %}
+ {% for runtime_feature_name, dependent_features in runtime_to_permissions_policy_map.items() | sort %}
if (RuntimeEnabledFeatures::{{runtime_feature_name}}Enabled()) {
{% for feature in dependent_features %}
default_feature_name_map.Set(k{{feature}}PolicyName,
@@ -86,7 +86,7 @@
// i.e. the feature is considered enabled by origin trial.
bool DisabledByOriginTrial(const String& feature_name,
FeatureContext* feature_context) {
- {% for feature_name, dependencies in fp_origin_trial_dependency_map.items() | sort %}
+ {% for feature_name, dependencies in pp_origin_trial_dependency_map.items() | sort %}
if (feature_name == k{{feature_name}}PolicyName) {
return
{%- for dependency in dependencies %}
@@ -114,7 +114,7 @@

String PermissionsPolicyFeatureToProtocol(mojom::blink::PermissionsPolicyFeature feature) {
switch (feature) {
- {% for feature in feature_policy_features %}
+ {% for feature in permissions_policy_features %}
case mojom::blink::PermissionsPolicyFeature::k{{feature.name}}:
return protocol::Page::PermissionsPolicyFeatureEnum::{{feature.devtools_enum_name}};
{% endfor %}
diff --git a/third_party/blink/renderer/build/scripts/tests/runtime_enabled_features_trial_insecure_not_deprecation.json5 b/third_party/blink/renderer/build/scripts/tests/runtime_enabled_features_trial_insecure_not_deprecation.json5
index ff3bd54..e96cc143 100644
--- a/third_party/blink/renderer/build/scripts/tests/runtime_enabled_features_trial_insecure_not_deprecation.json5
+++ b/third_party/blink/renderer/build/scripts/tests/runtime_enabled_features_trial_insecure_not_deprecation.json5
@@ -30,7 +30,7 @@
valid_type: "bool",
},

- feature_policy: {
+ permissions_policy: {
},
},

diff --git a/third_party/blink/renderer/core/animation/css_interpolation_types_map.cc b/third_party/blink/renderer/core/animation/css_interpolation_types_map.cc
index 82e3b2c8..b604452 100644
--- a/third_party/blink/renderer/core/animation/css_interpolation_types_map.cc
+++ b/third_party/blink/renderer/core/animation/css_interpolation_types_map.cc
@@ -119,9 +119,9 @@
property.IsCSSProperty() ? property : PropertyHandle(css_property);
// TODO(crbug.com/838263): Support site-defined list of acceptable properties
// through permissions policy declarations.
- bool property_maybe_blocked_by_feature_policy =
+ bool property_maybe_blocked_by_permissions_policy =
LayoutAnimationsPolicy::AffectedCSSProperties().Contains(&css_property);
- if (allow_all_animations_ || !property_maybe_blocked_by_feature_policy) {
+ if (allow_all_animations_ || !property_maybe_blocked_by_permissions_policy) {
switch (css_property.PropertyID()) {
case CSSPropertyID::kBaselineShift:
case CSSPropertyID::kBorderBottomWidth:
diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
index 5b45845..1c9e209 100644
--- a/third_party/blink/renderer/core/dom/document.cc
+++ b/third_party/blink/renderer/core/dom/document.cc
@@ -5755,12 +5755,12 @@
return;
}

- const String feature_policy_error =
+ const String permissions_policy_error =
"Setting `document.domain` is disabled by permissions policy.";
if (!dom_window_->IsFeatureEnabled(
mojom::blink::PermissionsPolicyFeature::kDocumentDomain,
- ReportOptions::kReportOnFailure, feature_policy_error)) {
- exception_state.ThrowSecurityError(feature_policy_error);
+ ReportOptions::kReportOnFailure, permissions_policy_error)) {
+ exception_state.ThrowSecurityError(permissions_policy_error);
return;
}

diff --git a/third_party/blink/renderer/core/execution_context/remote_security_context.cc b/third_party/blink/renderer/core/execution_context/remote_security_context.cc
index eaab6e6..da11092 100644
--- a/third_party/blink/renderer/core/execution_context/remote_security_context.cc
+++ b/third_party/blink/renderer/core/execution_context/remote_security_context.cc
@@ -41,11 +41,12 @@
void RemoteSecurityContext::InitializeFeaturePolicy(
const ParsedPermissionsPolicy& parsed_header,
const ParsedPermissionsPolicy& container_policy,
- const PermissionsPolicy* parent_feature_policy) {
- report_only_feature_policy_ = nullptr;
- feature_policy_ = PermissionsPolicy::CreateFromParentPolicy(
- parent_feature_policy, container_policy, security_origin_->ToUrlOrigin());
- feature_policy_->SetHeaderPolicy(parsed_header);
+ const PermissionsPolicy* parent_permissions_policy) {
+ report_only_permissions_policy_ = nullptr;
+ permissions_policy_ = PermissionsPolicy::CreateFromParentPolicy(
+ parent_permissions_policy, container_policy,
+ security_origin_->ToUrlOrigin());
+ permissions_policy_->SetHeaderPolicy(parsed_header);
}

} // namespace blink
diff --git a/third_party/blink/renderer/core/execution_context/remote_security_context.h b/third_party/blink/renderer/core/execution_context/remote_security_context.h
index 084a02d..cf40400 100644
--- a/third_party/blink/renderer/core/execution_context/remote_security_context.h
+++ b/third_party/blink/renderer/core/execution_context/remote_security_context.h
@@ -27,14 +27,14 @@
// * |parsed_header|: from the PermissionsPolicy part of the response
// headers.
// * |container_policy|: from <iframe>'s allow attribute.
- // * |parent_feature_policy|: which is the current state of feature
- // policies
- // in a parent browsing context (frame).
- // Note that |parent_feature_policy| is null, and |container_policy| is
+ // * |parent_permissions_policy|: which is the current state of permissions
+ // policies in a parent browsing context (frame).
+ // Note that |parent_permissions_policy| is null, and |container_policy| is
// empty for a top-level security context.
- void InitializeFeaturePolicy(const ParsedPermissionsPolicy& parsed_header,
- const ParsedPermissionsPolicy& container_policy,
- const PermissionsPolicy* parent_feature_policy);
+ void InitializeFeaturePolicy(
+ const ParsedPermissionsPolicy& parsed_header,
+ const ParsedPermissionsPolicy& container_policy,
+ const PermissionsPolicy* parent_permissions_policy);
};

} // namespace blink
diff --git a/third_party/blink/renderer/core/execution_context/security_context.cc b/third_party/blink/renderer/core/execution_context/security_context.cc
index a27d522..6d280bf 100644
--- a/third_party/blink/renderer/core/execution_context/security_context.cc
+++ b/third_party/blink/renderer/core/execution_context/security_context.cc
@@ -143,13 +143,13 @@
}

void SecurityContext::SetFeaturePolicy(
- std::unique_ptr<PermissionsPolicy> feature_policy) {
- feature_policy_ = std::move(feature_policy);
+ std::unique_ptr<PermissionsPolicy> permissions_policy) {
+ permissions_policy_ = std::move(permissions_policy);
}

void SecurityContext::SetReportOnlyFeaturePolicy(
- std::unique_ptr<PermissionsPolicy> feature_policy) {
- report_only_feature_policy_ = std::move(feature_policy);
+ std::unique_ptr<PermissionsPolicy> permissions_policy) {
+ report_only_permissions_policy_ = std::move(permissions_policy);
}

void SecurityContext::SetDocumentPolicy(
@@ -165,18 +165,19 @@
bool SecurityContext::IsFeatureEnabled(
mojom::blink::PermissionsPolicyFeature feature,
bool* should_report) const {
- DCHECK(feature_policy_);
- bool feature_policy_result = feature_policy_->IsFeatureEnabled(feature);
- bool report_only_feature_policy_result =
- !report_only_feature_policy_ ||
- report_only_feature_policy_->IsFeatureEnabled(feature);
+ DCHECK(permissions_policy_);
+ bool permissions_policy_result =
+ permissions_policy_->IsFeatureEnabled(feature);
+ bool report_only_permissions_policy_result =
+ !report_only_permissions_policy_ ||
+ report_only_permissions_policy_->IsFeatureEnabled(feature);

if (should_report) {
*should_report =
- !feature_policy_result || !report_only_feature_policy_result;
+ !permissions_policy_result || !report_only_permissions_policy_result;
}

- return feature_policy_result;
+ return permissions_policy_result;
}

bool SecurityContext::IsFeatureEnabled(
diff --git a/third_party/blink/renderer/core/execution_context/security_context.h b/third_party/blink/renderer/core/execution_context/security_context.h
index 6eebc69b..759d59f 100644
--- a/third_party/blink/renderer/core/execution_context/security_context.h
+++ b/third_party/blink/renderer/core/execution_context/security_context.h
@@ -134,10 +134,10 @@
}

const PermissionsPolicy* GetFeaturePolicy() const {
- return feature_policy_.get();
+ return permissions_policy_.get();
}
const PermissionsPolicy* GetReportOnlyFeaturePolicy() const {
- return report_only_feature_policy_.get();
+ return report_only_permissions_policy_.get();
}
void SetFeaturePolicy(std::unique_ptr<PermissionsPolicy>);
void SetReportOnlyFeaturePolicy(std::unique_ptr<PermissionsPolicy>);
@@ -178,8 +178,8 @@
protected:
network::mojom::blink::WebSandboxFlags sandbox_flags_;
scoped_refptr<SecurityOrigin> security_origin_;
- std::unique_ptr<PermissionsPolicy> feature_policy_;
- std::unique_ptr<PermissionsPolicy> report_only_feature_policy_;
+ std::unique_ptr<PermissionsPolicy> permissions_policy_;
+ std::unique_ptr<PermissionsPolicy> report_only_permissions_policy_;
std::unique_ptr<DocumentPolicy> document_policy_;
std::unique_ptr<DocumentPolicy> report_only_document_policy_;

diff --git a/third_party/blink/renderer/core/execution_context/security_context_init.cc b/third_party/blink/renderer/core/execution_context/security_context_init.cc
index 1b41b62..342f0f2 100644
--- a/third_party/blink/renderer/core/execution_context/security_context_init.cc
+++ b/third_party/blink/renderer/core/execution_context/security_context_init.cc
@@ -57,13 +57,13 @@
// TODO(domenic): we want to treat origin policy permissions policy as a single
// permissions policy, not a header serialization, so it should be processed
// differently.
-void MergeFeaturesFromOriginPolicy(WTF::StringBuilder& feature_policy,
+void MergeFeaturesFromOriginPolicy(WTF::StringBuilder& permissions_policy,
const WebOriginPolicy& origin_policy) {
- if (!origin_policy.feature_policy.IsNull()) {
- if (!feature_policy.IsEmpty()) {
- feature_policy.Append(',');
+ if (!origin_policy.permissions_policy.IsNull()) {
+ if (!permissions_policy.IsEmpty()) {
+ permissions_policy.Append(',');
}
- feature_policy.Append(origin_policy.feature_policy);
+ permissions_policy.Append(origin_policy.permissions_policy);
}
}

@@ -161,12 +161,12 @@
if (!feature_policy_header.IsEmpty())
UseCounter::Count(execution_context_, WebFeature::kFeaturePolicyHeader);

- feature_policy_header_ = PermissionsPolicyParser::ParseHeader(
+ permissions_policy_header_ = PermissionsPolicyParser::ParseHeader(
feature_policy_header, permissions_policy_header,
execution_context_->GetSecurityOrigin(), feature_policy_logger,
permissions_policy_logger, execution_context_);

- ParsedPermissionsPolicy report_only_feature_policy_header =
+ ParsedPermissionsPolicy parsed_report_only_permissions_policy_header =
PermissionsPolicyParser::ParseHeader(
response.HttpHeaderField(http_names::kFeaturePolicyReportOnly),
report_only_permissions_policy_header,
@@ -211,17 +211,17 @@
container_policy);
}

- std::unique_ptr<PermissionsPolicy> feature_policy;
- auto* parent_feature_policy =
+ std::unique_ptr<PermissionsPolicy> permissions_policy;
+ auto* parent_permissions_policy =
frame->Tree().Parent()
? frame->Tree().Parent()->GetSecurityContext()->GetFeaturePolicy()
: nullptr;
- feature_policy = PermissionsPolicy::CreateFromParentPolicy(
- parent_feature_policy, container_policy,
+ permissions_policy = PermissionsPolicy::CreateFromParentPolicy(
+ parent_permissions_policy, container_policy,
execution_context_->GetSecurityOrigin()->ToUrlOrigin());
- feature_policy->SetHeaderPolicy(feature_policy_header_);
+ permissions_policy->SetHeaderPolicy(permissions_policy_header_);
execution_context_->GetSecurityContext().SetFeaturePolicy(
- std::move(feature_policy));
+ std::move(permissions_policy));

// Report-only permissions policy only takes effect when it is stricter than
// enforced permissions policy, i.e. when enforced permissions policy allows a
@@ -231,12 +231,13 @@
// permissions policy, there is no need to inherit parent policy and container
// policy for report-only permissions policy. For inherited policies, the
// behavior is dominated by enforced permissions policy.
- if (!report_only_feature_policy_header.empty()) {
+ if (!parsed_report_only_permissions_policy_header.empty()) {
std::unique_ptr<PermissionsPolicy> report_only_policy =
PermissionsPolicy::CreateFromParentPolicy(
nullptr /* parent_policy */, {} /* container_policy */,
execution_context_->GetSecurityOrigin()->ToUrlOrigin());
- report_only_policy->SetHeaderPolicy(report_only_feature_policy_header);
+ report_only_policy->SetHeaderPolicy(
+ parsed_report_only_permissions_policy_header);
execution_context_->GetSecurityContext().SetReportOnlyFeaturePolicy(
std::move(report_only_policy));
}
diff --git a/third_party/blink/renderer/core/execution_context/security_context_init.h b/third_party/blink/renderer/core/execution_context/security_context_init.h
index 283d70c..2ca7353 100644
--- a/third_party/blink/renderer/core/execution_context/security_context_init.h
+++ b/third_party/blink/renderer/core/execution_context/security_context_init.h
@@ -52,12 +52,12 @@
const String& report_only_document_policy_header);

const ParsedPermissionsPolicy& FeaturePolicyHeader() const {
- return feature_policy_header_;
+ return permissions_policy_header_;
}

private:
ExecutionContext* execution_context_ = nullptr;
- ParsedPermissionsPolicy feature_policy_header_;
+ ParsedPermissionsPolicy permissions_policy_header_;
};

} // namespace blink
diff --git a/third_party/blink/renderer/core/exported/web_document_subresource_filter_test.cc b/third_party/blink/renderer/core/exported/web_document_subresource_filter_test.cc
index c3f103d..6340e3b 100644
--- a/third_party/blink/renderer/core/exported/web_document_subresource_filter_test.cc
+++ b/third_party/blink/renderer/core/exported/web_document_subresource_filter_test.cc
@@ -74,7 +74,7 @@
WebHistoryCommitType commit_type,
bool should_reset_browser_interface_broker,
network::mojom::WebSandboxFlags sandbox_flags,
- const ParsedPermissionsPolicy& feature_policy_header,
+ const ParsedPermissionsPolicy& permissions_policy_header,
const DocumentPolicyFeatureState& document_policy_header) override {
subresource_filter_ =
new TestDocumentSubresourceFilter(load_policy_for_next_load_);
diff --git a/third_party/blink/renderer/core/exported/web_shared_worker_impl.cc b/third_party/blink/renderer/core/exported/web_shared_worker_impl.cc
index 110d57b..8f4de52 100644
--- a/third_party/blink/renderer/core/exported/web_shared_worker_impl.cc
+++ b/third_party/blink/renderer/core/exported/web_shared_worker_impl.cc
@@ -263,7 +263,7 @@
std::move(worker_settings), mojom::blink::V8CacheOptions::kDefault,
nullptr /* worklet_module_response_map */,
std::move(browser_interface_broker), BeginFrameProviderParams(),
- nullptr /* parent_feature_policy */, base::UnguessableToken(),
+ nullptr /* parent_permissions_policy */, base::UnguessableToken(),
ukm_source_id);

auto thread_startup_data = WorkerBackingThreadStartupData::CreateDefault();
diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h
index 406fb67..e382e63 100644
--- a/third_party/blink/renderer/core/frame/local_frame_client.h
+++ b/third_party/blink/renderer/core/frame/local_frame_client.h
@@ -140,7 +140,7 @@
WebHistoryCommitType commit_type,
bool should_reset_browser_interface_broker,
network::mojom::WebSandboxFlags sandbox_flags,
- const blink::ParsedPermissionsPolicy& feature_policy_header,
+ const blink::ParsedPermissionsPolicy& permissions_policy_header,
const blink::DocumentPolicyFeatureState& document_policy_header) = 0;
virtual void DispatchDidFailLoad(const ResourceError&,
WebHistoryCommitType) = 0;
diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
index c626f95..2faa7c2 100644
--- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
+++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
@@ -405,7 +405,7 @@
WebHistoryCommitType commit_type,
bool should_reset_browser_interface_broker,
network::mojom::WebSandboxFlags sandbox_flags,
- const blink::ParsedPermissionsPolicy& feature_policy_header,
+ const blink::ParsedPermissionsPolicy& permissions_policy_header,
const blink::DocumentPolicyFeatureState& document_policy_header) {
if (!web_frame_->Parent()) {
web_frame_->ViewImpl()->DidCommitLoad(commit_type == kWebStandardCommit,
@@ -415,7 +415,7 @@
if (web_frame_->Client()) {
web_frame_->Client()->DidCommitNavigation(
commit_type, should_reset_browser_interface_broker, sandbox_flags,
- feature_policy_header, document_policy_header);
+ permissions_policy_header, document_policy_header);

// With local to local swap it's possible for the frame to be deleted as a
// side effect of JS event handlers called in DidCommitNavigation
diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.h b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
index f7a1687f..50472a4 100644
--- a/third_party/blink/renderer/core/frame/local_frame_client_impl.h
+++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
@@ -100,7 +100,7 @@
WebHistoryCommitType,
bool should_reset_browser_interface_broker,
network::mojom::WebSandboxFlags sandbox_flags,
- const blink::ParsedPermissionsPolicy& feature_policy_header,
+ const blink::ParsedPermissionsPolicy& permissions_policy_header,
const blink::DocumentPolicyFeatureState& document_policy_header) override;
void DispatchDidFailLoad(const ResourceError&, WebHistoryCommitType) override;
void DispatchDidFinishDocumentLoad() override;
diff --git a/third_party/blink/renderer/core/frame/remote_frame.cc b/third_party/blink/renderer/core/frame/remote_frame.cc
index 422c244..2b4536e 100644
--- a/third_party/blink/renderer/core/frame/remote_frame.cc
+++ b/third_party/blink/renderer/core/frame/remote_frame.cc
@@ -473,7 +473,7 @@

void RemoteFrame::SetReplicatedFeaturePolicyHeader(
const ParsedPermissionsPolicy& parsed_header) {
- feature_policy_header_ = parsed_header;
+ permissions_policy_header_ = parsed_header;
ApplyReplicatedFeaturePolicyHeader();
}

@@ -735,7 +735,7 @@
void RemoteFrame::DidSetFramePolicyHeaders(
network::mojom::blink::WebSandboxFlags sandbox_flags,
const WTF::Vector<ParsedPermissionsPolicyDeclaration>&
- parsed_feature_policy) {
+ parsed_permissions_policy) {
SetReplicatedSandboxFlags(sandbox_flags);
// Convert from WTF::Vector<ParsedPermissionsPolicyDeclaration>
// to std::vector<ParsedPermissionsPolicyDeclaration>, since
@@ -743,11 +743,11 @@
//
// TODO(crbug.com/1047273): Remove this conversion by switching
// ParsedPermissionsPolicy to operate over Vector
- ParsedPermissionsPolicy parsed_feature_policy_copy(
- parsed_feature_policy.size());
- for (size_t i = 0; i < parsed_feature_policy.size(); ++i)
- parsed_feature_policy_copy[i] = parsed_feature_policy[i];
- SetReplicatedFeaturePolicyHeader(parsed_feature_policy_copy);
+ ParsedPermissionsPolicy parsed_permissions_policy_copy(
+ parsed_permissions_policy.size());
+ for (size_t i = 0; i < parsed_permissions_policy.size(); ++i)
+ parsed_permissions_policy_copy[i] = parsed_permissions_policy[i];
+ SetReplicatedFeaturePolicyHeader(parsed_permissions_policy_copy);
}

// Update the proxy's FrameOwner with new sandbox flags and container policy
@@ -894,16 +894,16 @@
}

void RemoteFrame::ApplyReplicatedFeaturePolicyHeader() {
- const PermissionsPolicy* parent_feature_policy = nullptr;
+ const PermissionsPolicy* parent_permissions_policy = nullptr;
if (Frame* parent_frame = Parent()) {
- parent_feature_policy =
+ parent_permissions_policy =
parent_frame->GetSecurityContext()->GetFeaturePolicy();
}
ParsedPermissionsPolicy container_policy;
if (Owner())
container_policy = Owner()->GetFramePolicy().container_policy;
security_context_.InitializeFeaturePolicy(
- feature_policy_header_, container_policy, parent_feature_policy);
+ permissions_policy_header_, container_policy, parent_permissions_policy);
}

bool RemoteFrame::SynchronizeVisualProperties(bool propagate) {
diff --git a/third_party/blink/renderer/core/frame/remote_frame.h b/third_party/blink/renderer/core/frame/remote_frame.h
index 713bdef..f008c109 100644
--- a/third_party/blink/renderer/core/frame/remote_frame.h
+++ b/third_party/blink/renderer/core/frame/remote_frame.h
@@ -258,7 +258,7 @@
blink::FrameVisualProperties pending_visual_properties_;
scoped_refptr<cc::Layer> cc_layer_;
bool is_surface_layer_ = false;
- ParsedPermissionsPolicy feature_policy_header_;
+ ParsedPermissionsPolicy permissions_policy_header_;
String unique_name_;

viz::FrameSinkId frame_sink_id_;
diff --git a/third_party/blink/renderer/core/frame/web_frame_test.cc b/third_party/blink/renderer/core/frame/web_frame_test.cc
index 582315b7d..8b533e1 100644
--- a/third_party/blink/renderer/core/frame/web_frame_test.cc
+++ b/third_party/blink/renderer/core/frame/web_frame_test.cc
@@ -4235,7 +4235,7 @@
WebHistoryCommitType commit_type,
bool should_reset_browser_interface_broker,
network::mojom::WebSandboxFlags sandbox_flags,
- const ParsedPermissionsPolicy& feature_policy_header,
+ const ParsedPermissionsPolicy& permissions_policy_header,
const DocumentPolicyFeatureState& document_policy_header) override {
Frame()->View()->ResetScrollAndScaleState();
}
@@ -6477,7 +6477,7 @@
WebHistoryCommitType commit_type,
bool should_reset_browser_interface_broker,
network::mojom::WebSandboxFlags sandbox_flags,
- const ParsedPermissionsPolicy& feature_policy_header,
+ const ParsedPermissionsPolicy& permissions_policy_header,
const DocumentPolicyFeatureState& document_policy_header) final {
did_load_ = true;
}
@@ -9616,7 +9616,7 @@
WebHistoryCommitType history_commit_type,
bool should_reset_browser_interface_broker,
network::mojom::WebSandboxFlags sandbox_flags,
- const ParsedPermissionsPolicy& feature_policy_header,
+ const ParsedPermissionsPolicy& permissions_policy_header,
const DocumentPolicyFeatureState& document_policy_header) override {
history_commit_type_ = history_commit_type;
}
@@ -9883,7 +9883,7 @@
WebHistoryCommitType history_commit_type,
bool should_reset_browser_interface_broker,
network::mojom::WebSandboxFlags sandbox_flags,
- const ParsedPermissionsPolicy& feature_policy_header,
+ const ParsedPermissionsPolicy& permissions_policy_header,
const DocumentPolicyFeatureState& document_policy_header) final {
history_commit_type_ = history_commit_type;
}
diff --git a/third_party/blink/renderer/core/frame/web_local_frame_client_test.cc b/third_party/blink/renderer/core/frame/web_local_frame_client_test.cc
index 6030910..23d5f08 100644
--- a/third_party/blink/renderer/core/frame/web_local_frame_client_test.cc
+++ b/third_party/blink/renderer/core/frame/web_local_frame_client_test.cc
@@ -35,12 +35,12 @@
WebHistoryCommitType commit_type,
bool should_reset_browser_interface_broker,
network::mojom::WebSandboxFlags sandbox_flags,
- const ParsedPermissionsPolicy& feature_policy_header,
+ const ParsedPermissionsPolicy& permissions_policy_header,
const DocumentPolicyFeatureState& document_policy_header) override {
calls_.push_back("DidCommitNavigation");
TestWebFrameClient::DidCommitNavigation(
commit_type, should_reset_browser_interface_broker, sandbox_flags,
- feature_policy_header, document_policy_header);
+ permissions_policy_header, document_policy_header);
}

void DidCreateDocumentElement() override {
diff --git a/third_party/blink/renderer/core/html/html_iframe_element.cc b/third_party/blink/renderer/core/html/html_iframe_element.cc
index b6d0a82..c2b2a51 100644
--- a/third_party/blink/renderer/core/html/html_iframe_element.cc
+++ b/third_party/blink/renderer/core/html/html_iframe_element.cc
@@ -432,13 +432,13 @@

// Trust token redemption and signing (but not issuance) require that the
// trust-token-redemption permissions policy be present.
- bool operation_requires_feature_policy =
+ bool operation_requires_permissions_policy =
parsed_params->type ==
network::mojom::blink::TrustTokenOperationType::kRedemption ||
parsed_params->type ==
network::mojom::blink::TrustTokenOperationType::kSigning;

- if (operation_requires_feature_policy &&
+ if (operation_requires_permissions_policy &&
(!GetExecutionContext()->IsFeatureEnabled(
mojom::blink::PermissionsPolicyFeature::kTrustTokenRedemption))) {
GetExecutionContext()->AddConsoleMessage(
diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/third_party/blink/renderer/core/html/media/autoplay_policy.cc
index 7105daf..358342f 100644
--- a/third_party/blink/renderer/core/html/media/autoplay_policy.cc
+++ b/third_party/blink/renderer/core/html/media/autoplay_policy.cc
@@ -89,7 +89,7 @@
if (!document.GetFrame())
return false;

- bool feature_policy_enabled =
+ bool permissions_policy_enabled =
document.GetExecutionContext()->IsFeatureEnabled(
mojom::blink::PermissionsPolicyFeature::kAutoplay);

@@ -106,7 +106,7 @@
return true;
}

- if (!feature_policy_enabled)
+ if (!permissions_policy_enabled)
return false;
}

@@ -367,7 +367,7 @@

autoplay_initiated_ = true;

- bool feature_policy_enabled =
+ bool permissions_policy_enabled =
element_->GetExecutionContext() &&
element_->GetExecutionContext()->IsFeatureEnabled(
mojom::blink::PermissionsPolicyFeature::kAutoplay);
@@ -379,7 +379,7 @@
autoplay_initiated_ = false;
break;
}
- if (!feature_policy_enabled)
+ if (!permissions_policy_enabled)
break;
}
}
diff --git a/third_party/blink/renderer/core/inspector/inspector_page_agent.cc b/third_party/blink/renderer/core/inspector/inspector_page_agent.cc
index d102b7a..e4b9bb36 100644
--- a/third_party/blink/renderer/core/inspector/inspector_page_agent.cc
+++ b/third_party/blink/renderer/core/inspector/inspector_page_agent.cc
@@ -872,10 +872,10 @@
if (!frame)
return Response::ServerError("No frame for given id found in this target");

- const blink::PermissionsPolicy* feature_policy =
+ const blink::PermissionsPolicy* permissions_policy =
frame->GetSecurityContext()->GetFeaturePolicy();

- if (!feature_policy)
+ if (!permissions_policy)
return Response::ServerError("Frame not ready");

auto feature_states = std::make_unique<
diff --git a/third_party/blink/renderer/core/layout/ng/custom/layout_worklet_global_scope_proxy.cc b/third_party/blink/renderer/core/layout/ng/custom/layout_worklet_global_scope_proxy.cc
index a948b79..fc56661 100644
--- a/third_party/blink/renderer/core/layout/ng/custom/layout_worklet_global_scope_proxy.cc
+++ b/third_party/blink/renderer/core/layout/ng/custom/layout_worklet_global_scope_proxy.cc
@@ -51,7 +51,7 @@
base::UnguessableToken::Create(), nullptr /* worker_settings */,
mojom::blink::V8CacheOptions::kDefault, module_responses_map,
mojo::NullRemote() /* browser_interface_broker */,
- BeginFrameProviderParams(), nullptr /* parent_feature_policy */,
+ BeginFrameProviderParams(), nullptr /* parent_permissions_policy */,
window->GetAgentClusterID(), ukm::kInvalidSourceId,
window->GetExecutionContextToken(),
window->CrossOriginIsolatedCapability());
diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
index c712f83..7a7cbdb 100644
--- a/third_party/blink/renderer/core/loader/document_loader.cc
+++ b/third_party/blink/renderer/core/loader/document_loader.cc
@@ -478,7 +478,7 @@
// |response_| will use the newly committed response.
// |load_type_| will use default kStandard value.
// |replaces_current_history_item_| will be false.
- // |feature_policy_| and |document_policy_| are set in CommitNavigation(),
+ // |permissions_policy_| and |document_policy_| are set in CommitNavigation(),
// with the sandbox flags set in CalculateSandboxFlags().
// |is_client_redirect_| and |redirect_chain_| are not copied since future
// same-document navigations will clear the redirect chain anyways.
@@ -2069,7 +2069,7 @@
// |report_only_document_policy| does not block the page load. Its
// initialization is delayed to
// SecurityContextInit::InitializeDocumentPolicy(), similar to
- // |report_only_feature_policy|.
+ // |report_only_permissions_policy|.
security_init.ApplyDocumentPolicy(
document_policy_,
response_.HttpHeaderField(http_names::kDocumentPolicyReportOnly));
diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
index 5deb4c24..0cb31ed 100644
--- a/third_party/blink/renderer/core/loader/empty_clients.h
+++ b/third_party/blink/renderer/core/loader/empty_clients.h
@@ -259,7 +259,7 @@
WebHistoryCommitType commit_type,
bool should_reset_browser_interface_broker,
network::mojom::WebSandboxFlags sandbox_flags,
- const blink::ParsedPermissionsPolicy& feature_policy_header,
+ const blink::ParsedPermissionsPolicy& permissions_policy_header,
const blink::DocumentPolicyFeatureState& document_policy_header)
override {}
void DispatchDidFailLoad(const ResourceError&,
diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context_test.cc b/third_party/blink/renderer/core/loader/frame_fetch_context_test.cc
index b6b9c5f..0a84a2e 100644
--- a/third_party/blink/renderer/core/loader/frame_fetch_context_test.cc
+++ b/third_party/blink/renderer/core/loader/frame_fetch_context_test.cc
@@ -121,17 +121,18 @@
protected:
void SetUp() override { RecreateFetchContext(); }

- void RecreateFetchContext(const KURL& url = KURL(),
- const String& feature_policy_header = String()) {
+ void RecreateFetchContext(
+ const KURL& url = KURL(),
+ const String& permissions_policy_header = String()) {
dummy_page_holder = nullptr;
dummy_page_holder = std::make_unique<DummyPageHolder>(IntSize(500, 500));
dummy_page_holder->GetPage().SetDeviceScaleFactorDeprecated(1.0);
if (url.IsValid()) {
auto params = WebNavigationParams::CreateWithHTMLBufferForTesting(
SharedBuffer::Create(), url);
- if (!feature_policy_header.IsEmpty()) {
+ if (!permissions_policy_header.IsEmpty()) {
params->response.SetHttpHeaderField(http_names::kFeaturePolicy,
- feature_policy_header);
+ permissions_policy_header);
}
dummy_page_holder->GetFrame().Loader().CommitNavigation(
std::move(params), nullptr /* extra_data */);
diff --git a/third_party/blink/renderer/core/loader/modulescript/module_script_loader_test.cc b/third_party/blink/renderer/core/loader/modulescript/module_script_loader_test.cc
index c2097c2..933391b 100644
--- a/third_party/blink/renderer/core/loader/modulescript/module_script_loader_test.cc
+++ b/third_party/blink/renderer/core/loader/modulescript/module_script_loader_test.cc
@@ -227,7 +227,7 @@
mojom::blink::V8CacheOptions::kDefault,
MakeGarbageCollected<WorkletModuleResponsesMap>(),
mojo::NullRemote() /* browser_interface_broker */,
- BeginFrameProviderParams(), nullptr /* parent_feature_policy */,
+ BeginFrameProviderParams(), nullptr /* parent_permissions_policy */,
base::UnguessableToken::Create() /* agent_cluster_id */);
creation_params->parent_context_token = GetFrame().GetLocalFrameToken();
global_scope_ = MakeGarbageCollected<FakeWorkletGlobalScope>(
diff --git a/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5 b/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5
index bc585cd..7ca51bb 100644
--- a/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5
+++ b/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5
@@ -19,9 +19,9 @@
default: [],
valid_type: "list",
},
- // feature_policy_name: "FEATURE_NAME" is used to specify the policy name
+ // permissions_policy_name: "FEATURE_NAME" is used to specify the policy name
// which gets parsed from the header or the allow attribute.
- feature_policy_name: {
+ permissions_policy_name: {
},

// feature_default: Default allowlist state for feature. This corresponds
@@ -36,264 +36,264 @@
data: [
{
name: "Accelerometer",
- feature_policy_name: "accelerometer",
+ permissions_policy_name: "accelerometer",
},
{
name: "AmbientLightSensor",
- feature_policy_name: "ambient-light-sensor",
+ permissions_policy_name: "ambient-light-sensor",
depends_on: ["SensorExtraClasses"],
},
{
name: "Autoplay",
- feature_policy_name: "autoplay",
+ permissions_policy_name: "autoplay",
},
{
name: "Camera",
- feature_policy_name: "camera",
+ permissions_policy_name: "camera",
},
{
name: "ClientHintDPR",
- feature_policy_name: "ch-dpr",
+ permissions_policy_name: "ch-dpr",
depends_on: ["FeaturePolicyForClientHints"],
},
{
name: "ClientHintDeviceMemory",
- feature_policy_name: "ch-device-memory",
+ permissions_policy_name: "ch-device-memory",
depends_on: ["FeaturePolicyForClientHints"],
},
{
name: "ClientHintDownlink",
- feature_policy_name: "ch-downlink",
+ permissions_policy_name: "ch-downlink",
depends_on: ["FeaturePolicyForClientHints"],
},
{
name: "ClientHintECT",
- feature_policy_name: "ch-ect",
+ permissions_policy_name: "ch-ect",
depends_on: ["FeaturePolicyForClientHints"],
},
{
name: "ClientHintLang",
- feature_policy_name: "ch-lang",
+ permissions_policy_name: "ch-lang",
depends_on: ["FeaturePolicyForClientHints"],
},
{
name: "ClientHintRTT",
- feature_policy_name: "ch-rtt",
+ permissions_policy_name: "ch-rtt",
depends_on: ["FeaturePolicyForClientHints"],
},
{
name: "ClientHintUA",
- feature_policy_name: "ch-ua",
+ permissions_policy_name: "ch-ua",
feature_default: "EnableForAll",
depends_on: ["FeaturePolicyForClientHints"],
},
{
name: "ClientHintUAArch",
- feature_policy_name: "ch-ua-arch",
+ permissions_policy_name: "ch-ua-arch",
depends_on: ["FeaturePolicyForClientHints"],
},
{
name: "ClientHintUAPlatform",
- feature_policy_name: "ch-ua-platform",
+ permissions_policy_name: "ch-ua-platform",
depends_on: ["FeaturePolicyForClientHints"],
},
{
name: "ClientHintUAModel",
- feature_policy_name: "ch-ua-model",
+ permissions_policy_name: "ch-ua-model",
depends_on: ["FeaturePolicyForClientHints"],
},
{
name: "ClientHintUAMobile",
- feature_policy_name: "ch-ua-mobile",
+ permissions_policy_name: "ch-ua-mobile",
feature_default: "EnableForAll",
depends_on: ["FeaturePolicyForClientHints"],
},
{
name: "ClientHintUAFullVersion",
- feature_policy_name: "ch-ua-full-version",
+ permissions_policy_name: "ch-ua-full-version",
depends_on: ["FeaturePolicyForClientHints"],
},
{
name: "ClientHintUAPlatformVersion",
- feature_policy_name: "ch-ua-platform-version",
+ permissions_policy_name: "ch-ua-platform-version",
depends_on: ["FeaturePolicyForClientHints"],
},
{
name: "ClientHintViewportWidth",
- feature_policy_name: "ch-viewport-width",
+ permissions_policy_name: "ch-viewport-width",
depends_on: ["FeaturePolicyForClientHints"],
},
{
name: "ClientHintWidth",
- feature_policy_name: "ch-width",
+ permissions_policy_name: "ch-width",
depends_on: ["FeaturePolicyForClientHints"],
},
{
name: "ClipboardRead",
- feature_policy_name: "clipboard-read",
+ permissions_policy_name: "clipboard-read",
},
{
name: "ClipboardWrite",
- feature_policy_name: "clipboard-write",
+ permissions_policy_name: "clipboard-write",
},
{
name: "ConversionMeasurement",
- feature_policy_name: "conversion-measurement",
+ permissions_policy_name: "conversion-measurement",
depends_on: ["ConversionMeasurement"],
},
{
name: "CrossOriginIsolated",
- feature_policy_name: "cross-origin-isolated",
+ permissions_policy_name: "cross-origin-isolated",
depends_on: ["CrossOriginIsolation"],
},
{
name: "DisplayCapture",
- feature_policy_name: "display-capture",
+ permissions_policy_name: "display-capture",
depends_on: ["GetCurrentBrowsingContextMedia"],
},
{
name: "DocumentDomain",
- feature_policy_name: "document-domain",
+ permissions_policy_name: "document-domain",
feature_default: "EnableForAll",
},
{
name: "EncryptedMedia",
- feature_policy_name: "encrypted-media",
+ permissions_policy_name: "encrypted-media",
},
{
name: "ExecutionWhileOutOfViewport",
- feature_policy_name: "execution-while-out-of-viewport",
+ permissions_policy_name: "execution-while-out-of-viewport",
feature_default: "EnableForAll",
depends_on: ["FreezeFramesOnVisibility"],
},
{
name: "ExecutionWhileNotRendered",
- feature_policy_name: "execution-while-not-rendered",
+ permissions_policy_name: "execution-while-not-rendered",
feature_default: "EnableForAll",
depends_on: ["FreezeFramesOnVisibility"],
},
{
name: "FocusWithoutUserActivation",
- feature_policy_name: "focus-without-user-activation",
+ permissions_policy_name: "focus-without-user-activation",
feature_default: "EnableForAll",
depends_on: ["BlockingFocusWithoutUserActivation"],
},
{
name: "Fullscreen",
- feature_policy_name: "fullscreen",
+ permissions_policy_name: "fullscreen",
},
{
name: "Frobulate",
- feature_policy_name: "frobulate",
+ permissions_policy_name: "frobulate",
depends_on: ["OriginTrialsSampleAPI"],
},
{
name: "Gamepad",
- feature_policy_name: "gamepad",
+ permissions_policy_name: "gamepad",
depends_on: ["RestrictGamepadAccess"],
},
{
name: "Geolocation",
- feature_policy_name: "geolocation",
+ permissions_policy_name: "geolocation",
},
{
name: "Gyroscope",
- feature_policy_name: "gyroscope",
+ permissions_policy_name: "gyroscope",
},
{
name: "Hid",
- feature_policy_name: "hid",
+ permissions_policy_name: "hid",
depends_on: ["WebHID"],
},
{
name: "IdleDetection",
- feature_policy_name: "idle-detection",
+ permissions_policy_name: "idle-detection",
depends_on: ["IdleDetection"],
},
{
name: "InterestCohort",
- feature_policy_name: "interest-cohort",
+ permissions_policy_name: "interest-cohort",
feature_default: "EnableForAll",
depends_on: ["InterestCohortFeaturePolicy"],
},
{
name: "Magnetometer",
- feature_policy_name: "magnetometer",
+ permissions_policy_name: "magnetometer",
},
{
name: "Microphone",
- feature_policy_name: "microphone",
+ permissions_policy_name: "microphone",
},
{
name: "MidiFeature",
- feature_policy_name: "midi",
+ permissions_policy_name: "midi",
},
{
name: "OTPCredentials",
- feature_policy_name: "otp-credentials",
+ permissions_policy_name: "otp-credentials",
depends_on: ["WebOTPAssertionFeaturePolicy"],
},
{
name: "Payment",
- feature_policy_name: "payment",
+ permissions_policy_name: "payment",
depends_on: ["PaymentRequest"],
},
{
name: "PictureInPicture",
- feature_policy_name: "picture-in-picture",
+ permissions_policy_name: "picture-in-picture",
feature_default: "EnableForAll",
depends_on: ["PictureInPictureAPI"],
},
{
name: "PublicKeyCredentialsGet",
- feature_policy_name: "publickey-credentials-get",
+ permissions_policy_name: "publickey-credentials-get",
depends_on: ["WebAuthenticationGetAssertionFeaturePolicy"],
},
{
name: "ScreenWakeLock",
- feature_policy_name: "screen-wake-lock",
+ permissions_policy_name: "screen-wake-lock",
depends_on: ["WakeLock"],
},
{
name: "Serial",
- feature_policy_name: "serial",
+ permissions_policy_name: "serial",
depends_on: ["Serial"],
},
{
name: "StorageAccessAPI",
feature_default: "EnableForAll",
- feature_policy_name: "storage-access-api",
+ permissions_policy_name: "storage-access-api",
depends_on: ["StorageAccessAPI"],
},
{
name: "SyncXHR",
feature_default: "EnableForAll",
- feature_policy_name: "sync-xhr",
+ permissions_policy_name: "sync-xhr",
},
{
name: "TrustTokenRedemption",
- feature_policy_name: "trust-token-redemption",
+ permissions_policy_name: "trust-token-redemption",
depends_on: ["TrustTokens"],
},
{
name: "Usb",
- feature_policy_name: "usb",
+ permissions_policy_name: "usb",
depends_on: ["WebUSB"],
},
{
name: "VerticalScroll",
- feature_policy_name: "vertical-scroll",
+ permissions_policy_name: "vertical-scroll",
feature_default: "EnableForAll",
depends_on: ["ExperimentalPolicies"],
},
{
name: "WebShare",
- feature_policy_name: "web-share",
+ permissions_policy_name: "web-share",
depends_on: ["WebShare"],
},
{
name: "WebXr",
- feature_policy_name: "xr-spatial-tracking",
+ permissions_policy_name: "xr-spatial-tracking",
depends_on: ["WebXR"],
},
],
diff --git a/third_party/blink/renderer/core/permissions_policy/policy_test.cc b/third_party/blink/renderer/core/permissions_policy/policy_test.cc
index f73b83c..fbbc3d5 100644
--- a/third_party/blink/renderer/core/permissions_policy/policy_test.cc
+++ b/third_party/blink/renderer/core/permissions_policy/policy_test.cc
@@ -29,19 +29,19 @@

auto origin = SecurityOrigin::CreateFromString(kSelfOrigin);

- auto feature_policy = PermissionsPolicy::CreateFromParentPolicy(
+ auto permissions_policy = PermissionsPolicy::CreateFromParentPolicy(
nullptr, ParsedPermissionsPolicy(), origin->ToUrlOrigin());
auto header = PermissionsPolicyParser::ParseHeader(
"fullscreen *; payment 'self'; midi 'none'; camera 'self' "
"https://example.com https://example.net",
/* permissions_policy_header */ g_empty_string, origin.get(),
dummy_logger_, dummy_logger_);
- feature_policy->SetHeaderPolicy(header);
+ permissions_policy->SetHeaderPolicy(header);

auto& security_context =
page_holder_->GetFrame().DomWindow()->GetSecurityContext();
security_context.SetSecurityOriginForTesting(origin);
- security_context.SetFeaturePolicy(std::move(feature_policy));
+ security_context.SetFeaturePolicy(std::move(permissions_policy));
}

DOMFeaturePolicy* GetPolicy() const { return policy_; }
diff --git a/third_party/blink/renderer/core/workers/global_scope_creation_params.cc b/third_party/blink/renderer/core/workers/global_scope_creation_params.cc
index 830ba46..9fd95ed 100644
--- a/third_party/blink/renderer/core/workers/global_scope_creation_params.cc
+++ b/third_party/blink/renderer/core/workers/global_scope_creation_params.cc
@@ -37,7 +37,7 @@
mojo::PendingRemote<mojom::blink::BrowserInterfaceBroker>
browser_interface_broker,
BeginFrameProviderParams begin_frame_provider_params,
- const PermissionsPolicy* parent_feature_policy,
+ const PermissionsPolicy* parent_permissions_policy,
base::UnguessableToken agent_cluster_id,
ukm::SourceId ukm_source_id,
const base::Optional<ExecutionContextToken>& parent_context_token,
@@ -67,8 +67,8 @@
begin_frame_provider_params(std::move(begin_frame_provider_params)),
// At the moment, workers do not support their container policy being set,
// so it will just be an empty ParsedPermissionsPolicy for now.
- worker_feature_policy(PermissionsPolicy::CreateFromParentPolicy(
- parent_feature_policy,
+ worker_permissions_policy(PermissionsPolicy::CreateFromParentPolicy(
+ parent_permissions_policy,
ParsedPermissionsPolicy() /* container_policy */,
starter_origin->ToUrlOrigin())),
agent_cluster_id(agent_cluster_id),
diff --git a/third_party/blink/renderer/core/workers/global_scope_creation_params.h b/third_party/blink/renderer/core/workers/global_scope_creation_params.h
index 68e96e9..3da1a7d 100644
--- a/third_party/blink/renderer/core/workers/global_scope_creation_params.h
+++ b/third_party/blink/renderer/core/workers/global_scope_creation_params.h
@@ -65,7 +65,7 @@
mojo::PendingRemote<mojom::blink::BrowserInterfaceBroker>
browser_interface_broker = mojo::NullRemote(),
BeginFrameProviderParams begin_frame_provider_params = {},
- const PermissionsPolicy* parent_feature_policy = nullptr,
+ const PermissionsPolicy* parent_permissions_policy = nullptr,
base::UnguessableToken agent_cluster_id = {},
ukm::SourceId ukm_source_id = ukm::kInvalidSourceId,
const base::Optional<ExecutionContextToken>& parent_context_token =
@@ -163,7 +163,7 @@

BeginFrameProviderParams begin_frame_provider_params;

- std::unique_ptr<PermissionsPolicy> worker_feature_policy;
+ std::unique_ptr<PermissionsPolicy> worker_permissions_policy;

// Set when the worker/worklet has the same AgentClusterID as the execution
// context that created it (e.g. for a dedicated worker).
diff --git a/third_party/blink/renderer/core/workers/main_thread_worklet_test.cc b/third_party/blink/renderer/core/workers/main_thread_worklet_test.cc
index 6f513aa..92e7877 100644
--- a/third_party/blink/renderer/core/workers/main_thread_worklet_test.cc
+++ b/third_party/blink/renderer/core/workers/main_thread_worklet_test.cc
@@ -74,7 +74,7 @@
mojom::blink::V8CacheOptions::kDefault,
MakeGarbageCollected<WorkletModuleResponsesMap>(),
mojo::NullRemote() /* browser_interface_broker */,
- BeginFrameProviderParams(), nullptr /* parent_feature_policy */,
+ BeginFrameProviderParams(), nullptr /* parent_permissions_policy */,
window->GetAgentClusterID(), ukm::kInvalidSourceId,
window->GetExecutionContextToken());
global_scope_ = MakeGarbageCollected<FakeWorkletGlobalScope>(
diff --git a/third_party/blink/renderer/core/workers/threaded_worklet_messaging_proxy.cc b/third_party/blink/renderer/core/workers/threaded_worklet_messaging_proxy.cc
index 52431662..089beaa 100644
--- a/third_party/blink/renderer/core/workers/threaded_worklet_messaging_proxy.cc
+++ b/third_party/blink/renderer/core/workers/threaded_worklet_messaging_proxy.cc
@@ -73,7 +73,7 @@
std::make_unique<WorkerSettings>(window->GetFrame()->GetSettings()),
mojom::blink::V8CacheOptions::kDefault, module_responses_map,
mojo::NullRemote() /* browser_interface_broker */,
- BeginFrameProviderParams(), nullptr /* parent_feature_policy */,
+ BeginFrameProviderParams(), nullptr /* parent_permissions_policy */,
window->GetAgentClusterID(), ukm::kInvalidSourceId,
window->GetExecutionContextToken(),
window->CrossOriginIsolatedCapability());
diff --git a/third_party/blink/renderer/core/workers/threaded_worklet_test.cc b/third_party/blink/renderer/core/workers/threaded_worklet_test.cc
index 6360680..889b743 100644
--- a/third_party/blink/renderer/core/workers/threaded_worklet_test.cc
+++ b/third_party/blink/renderer/core/workers/threaded_worklet_test.cc
@@ -225,7 +225,7 @@
mojom::blink::V8CacheOptions::kDefault,
MakeGarbageCollected<WorkletModuleResponsesMap>(),
mojo::NullRemote() /* browser_interface_broker */,
- BeginFrameProviderParams(), nullptr /* parent_feature_policy */,
+ BeginFrameProviderParams(), nullptr /* parent_permissions_policy */,
GetExecutionContext()->GetAgentClusterID(), ukm::kInvalidSourceId,
GetExecutionContext()->GetExecutionContextToken()),
base::nullopt, base::nullopt);
diff --git a/third_party/blink/renderer/core/workers/worker_global_scope.cc b/third_party/blink/renderer/core/workers/worker_global_scope.cc
index eca99ef..56fe4112 100644
--- a/third_party/blink/renderer/core/workers/worker_global_scope.cc
+++ b/third_party/blink/renderer/core/workers/worker_global_scope.cc
@@ -587,9 +587,9 @@
// A PermissionsPolicy is created by
// PermissionsPolicy::CreateFromParentPolicy, even if the parent policy is
// null.
- DCHECK(creation_params->worker_feature_policy);
+ DCHECK(creation_params->worker_permissions_policy);
GetSecurityContext().SetFeaturePolicy(
- std::move(creation_params->worker_feature_policy));
+ std::move(creation_params->worker_permissions_policy));
}

void WorkerGlobalScope::ExceptionThrown(ErrorEvent* event) {
diff --git a/third_party/blink/renderer/core/xmlhttprequest/xml_http_request.cc b/third_party/blink/renderer/core/xmlhttprequest/xml_http_request.cc
index f88d431..f6ae705 100644
--- a/third_party/blink/renderer/core/xmlhttprequest/xml_http_request.cc
+++ b/third_party/blink/renderer/core/xmlhttprequest/xml_http_request.cc
@@ -731,7 +731,7 @@

if (!async_) {
if (GetExecutionContext()->IsWindow()) {
- bool sync_xhr_disabled_by_feature_policy =
+ bool sync_xhr_disabled_by_permissions_policy =
!GetExecutionContext()->IsFeatureEnabled(
mojom::blink::PermissionsPolicyFeature::kSyncXHR,
ReportOptions::kReportOnFailure,
@@ -745,7 +745,7 @@

// SyncXHR can be controlled by either permissions policy or document
// policy during the migration period. See crbug.com/1146505.
- if (sync_xhr_disabled_by_feature_policy ||
+ if (sync_xhr_disabled_by_permissions_policy ||
sync_xhr_disabled_by_document_policy) {
HandleNetworkError();
ThrowForLoadFailureIfNeeded(exception_state, String());
@@ -1463,11 +1463,11 @@
return;
}

- bool operation_requires_feature_policy =
+ bool operation_requires_permissions_policy =
params->type ==
network::mojom::blink::TrustTokenOperationType::kRedemption ||
params->type == network::mojom::blink::TrustTokenOperationType::kSigning;
- if (operation_requires_feature_policy &&
+ if (operation_requires_permissions_policy &&
!GetExecutionContext()->IsFeatureEnabled(
mojom::blink::PermissionsPolicyFeature::kTrustTokenRedemption)) {
exception_state.ThrowDOMException(
diff --git a/third_party/blink/renderer/modules/csspaint/paint_worklet_global_scope_proxy.cc b/third_party/blink/renderer/modules/csspaint/paint_worklet_global_scope_proxy.cc
index b22149c..30da277 100644
--- a/third_party/blink/renderer/modules/csspaint/paint_worklet_global_scope_proxy.cc
+++ b/third_party/blink/renderer/modules/csspaint/paint_worklet_global_scope_proxy.cc
@@ -50,7 +50,7 @@
base::UnguessableToken::Create(), nullptr /* worker_settings */,
mojom::blink::V8CacheOptions::kDefault, module_responses_map,
mojo::NullRemote() /* browser_interface_broker */,
- BeginFrameProviderParams(), nullptr /* parent_feature_policy */,
+ BeginFrameProviderParams(), nullptr /* parent_permissions_policy */,
window->GetAgentClusterID(), ukm::kInvalidSourceId,
window->GetExecutionContextToken(),
window->CrossOriginIsolatedCapability());
diff --git a/third_party/blink/renderer/modules/exported/web_embedded_worker_impl.cc b/third_party/blink/renderer/modules/exported/web_embedded_worker_impl.cc
index ba6221f..df413c03 100644
--- a/third_party/blink/renderer/modules/exported/web_embedded_worker_impl.cc
+++ b/third_party/blink/renderer/modules/exported/web_embedded_worker_impl.cc
@@ -225,7 +225,7 @@
mojom::blink::V8CacheOptions::kFullCodeWithoutHeatCheck,
nullptr /* worklet_module_respones_map */,
std::move(browser_interface_broker), BeginFrameProviderParams(),
- nullptr /* parent_feature_policy */,
+ nullptr /* parent_permissions_policy */,
base::UnguessableToken() /* agent_cluster_id */,
worker_start_data->ukm_source_id);

diff --git a/third_party/blink/renderer/modules/webaudio/audio_worklet_global_scope_test.cc b/third_party/blink/renderer/modules/webaudio/audio_worklet_global_scope_test.cc
index 1e357b4b..8f39bc3 100644
--- a/third_party/blink/renderer/modules/webaudio/audio_worklet_global_scope_test.cc
+++ b/third_party/blink/renderer/modules/webaudio/audio_worklet_global_scope_test.cc
@@ -91,7 +91,7 @@
mojom::blink::V8CacheOptions::kDefault,
MakeGarbageCollected<WorkletModuleResponsesMap>(),
mojo::NullRemote() /* browser_interface_broker */,
- BeginFrameProviderParams(), nullptr /* parent_feature_policy */,
+ BeginFrameProviderParams(), nullptr /* parent_permissions_policy */,
window->GetAgentClusterID(), ukm::kInvalidSourceId,
window->GetExecutionContextToken()),
base::nullopt, std::make_unique<WorkerDevToolsParams>());
diff --git a/third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc b/third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc
index ee61138..70112b5 100644
--- a/third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc
+++ b/third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc
@@ -109,7 +109,7 @@
mojom::blink::V8CacheOptions::kDefault,
MakeGarbageCollected<WorkletModuleResponsesMap>(),
mojo::NullRemote() /* browser_interface_broker */,
- BeginFrameProviderParams(), nullptr /* parent_feature_policy */,
+ BeginFrameProviderParams(), nullptr /* parent_permissions_policy */,
window->GetAgentClusterID(), ukm::kInvalidSourceId,
window->GetExecutionContextToken()),
base::nullopt, std::make_unique<WorkerDevToolsParams>());
diff --git a/third_party/blink/renderer/modules/worklet/worklet_thread_test_common.cc b/third_party/blink/renderer/modules/worklet/worklet_thread_test_common.cc
index 4f023d2..bcc6e3c 100644
--- a/third_party/blink/renderer/modules/worklet/worklet_thread_test_common.cc
+++ b/third_party/blink/renderer/modules/worklet/worklet_thread_test_common.cc
@@ -42,7 +42,7 @@
mojom::blink::V8CacheOptions::kDefault,
MakeGarbageCollected<WorkletModuleResponsesMap>(),
mojo::NullRemote() /* browser_interface_broker */,
- BeginFrameProviderParams(), nullptr /* parent_feature_policy */,
+ BeginFrameProviderParams(), nullptr /* parent_permissions_policy */,
window->GetAgentClusterID(), ukm::kInvalidSourceId,
window->GetExecutionContextToken()),
base::nullopt, std::make_unique<WorkerDevToolsParams>());
diff --git a/third_party/blink/renderer/platform/loader/fetch/url_loader/sync_load_context.cc b/third_party/blink/renderer/platform/loader/fetch/url_loader/sync_load_context.cc
index 0c51a5cd..4daeea0 100644
--- a/third_party/blink/renderer/platform/loader/fetch/url_loader/sync_load_context.cc
+++ b/third_party/blink/renderer/platform/loader/fetch/url_loader/sync_load_context.cc
@@ -165,8 +165,8 @@
if (removed_headers) {
// TODO(yoav): Get the actual PermissionsPolicy here to support selective
// removal for sync XHR.
- FindClientHintsToRemove(nullptr /* feature_policy */, redirect_info.new_url,
- removed_headers);
+ FindClientHintsToRemove(nullptr /* permissions_policy */,
+ redirect_info.new_url, removed_headers);
}

response_->url = redirect_info.new_url;
diff --git a/weblayer/browser/webrtc/media_stream_manager.cc b/weblayer/browser/webrtc/media_stream_manager.cc
index 967fdc4..99990c5 100644
--- a/weblayer/browser/webrtc/media_stream_manager.cc
+++ b/weblayer/browser/webrtc/media_stream_manager.cc
@@ -146,7 +146,7 @@
content::MediaResponseCallback callback,
const blink::MediaStreamDevices& devices,
blink::mojom::MediaStreamRequestResult result,
- bool blocked_by_feature_policy,
+ bool blocked_by_permissions_policy,
ContentSetting audio_setting,
ContentSetting video_setting) {
if (result != blink::mojom::MediaStreamRequestResult::OK) {
diff --git a/weblayer/browser/webrtc/media_stream_manager.h b/weblayer/browser/webrtc/media_stream_manager.h
index 676ea39..4ed5dc6 100644
--- a/weblayer/browser/webrtc/media_stream_manager.h
+++ b/weblayer/browser/webrtc/media_stream_manager.h
@@ -58,7 +58,7 @@
content::MediaResponseCallback callback,
const blink::MediaStreamDevices& devices,
blink::mojom::MediaStreamRequestResult result,
- bool blocked_by_feature_policy,
+ bool blocked_by_permissions_policy,
ContentSetting audio_setting,
ContentSetting video_setting);