Commit 50f592a4 authored by Sergey Ulanov's avatar Sergey Ulanov Committed by Commit Bot

[Fuchsia] Remove usage of "whitelist" in //fuchsia.

Replace with more inclusive terms per Chromium style guide.

Change-Id: I96e2433b10f0ecb9a208b33ba9a3ddd2155a7a8f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2337093
Auto-Submit: Sergey Ulanov <sergeyu@chromium.org>
Reviewed-by: default avatarKevin Marshall <kmarshall@chromium.org>
Commit-Queue: Kevin Marshall <kmarshall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#794647}
parent a831717c
...@@ -96,8 +96,8 @@ bool FrameFocusRules::SupportsChildActivation(const aura::Window*) const { ...@@ -96,8 +96,8 @@ bool FrameFocusRules::SupportsChildActivation(const aura::Window*) const {
return true; return true;
} }
bool IsOriginWhitelisted(const GURL& url, bool IsOriginAllowed(const GURL& url,
const std::vector<std::string>& allowed_origins) { const std::vector<std::string>& allowed_origins) {
constexpr const char kWildcard[] = "*"; constexpr const char kWildcard[] = "*";
for (const std::string& origin : allowed_origins) { for (const std::string& origin : allowed_origins) {
...@@ -106,8 +106,9 @@ bool IsOriginWhitelisted(const GURL& url, ...@@ -106,8 +106,9 @@ bool IsOriginWhitelisted(const GURL& url,
GURL origin_url(origin); GURL origin_url(origin);
if (!origin_url.is_valid()) { if (!origin_url.is_valid()) {
DLOG(WARNING) << "Ignored invalid origin spec for whitelisting: " DLOG(WARNING)
<< origin; << "Ignored invalid origin spec when checking allowed list: "
<< origin;
continue; continue;
} }
...@@ -309,7 +310,7 @@ void FrameImpl::ExecuteJavaScriptInternal(std::vector<std::string> origins, ...@@ -309,7 +310,7 @@ void FrameImpl::ExecuteJavaScriptInternal(std::vector<std::string> origins,
return; return;
} }
if (!IsOriginWhitelisted(web_contents_->GetLastCommittedURL(), origins)) { if (!IsOriginAllowed(web_contents_->GetLastCommittedURL(), origins)) {
result.set_err(fuchsia::web::FrameError::INVALID_ORIGIN); result.set_err(fuchsia::web::FrameError::INVALID_ORIGIN);
callback(std::move(result)); callback(std::move(result));
return; return;
...@@ -543,7 +544,7 @@ void FrameImpl::MaybeInjectBeforeLoadScripts( ...@@ -543,7 +544,7 @@ void FrameImpl::MaybeInjectBeforeLoadScripts(
before_load_script_injector->ClearOnLoadScripts(); before_load_script_injector->ClearOnLoadScripts();
for (uint64_t script_id : before_load_scripts_order_) { for (uint64_t script_id : before_load_scripts_order_) {
const OriginScopedScript& script = before_load_scripts_[script_id]; const OriginScopedScript& script = before_load_scripts_[script_id];
if (IsOriginWhitelisted(navigation_handle->GetURL(), script.origins())) { if (IsOriginAllowed(navigation_handle->GetURL(), script.origins())) {
// TODO(crbug.com/1060846): Stop using handle<shared_buffer>. // TODO(crbug.com/1060846): Stop using handle<shared_buffer>.
before_load_script_injector->AddOnLoadScript( before_load_script_injector->AddOnLoadScript(
mojo::WrapReadOnlySharedMemoryRegion(script.script().Duplicate())); mojo::WrapReadOnlySharedMemoryRegion(script.script().Duplicate()));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment