Extensions: WAR: Exit early if resources not defined in manifest.json
Clean up a bit of the code around this point as well, grouping variable assignment together. Additionally, use a ternary operator for simplicity. Bug: chromium:398728546 Change-Id: Ia538bc8930390ea551118c05f1ca4aea3d0a0061 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6305448 Reviewed-by: David Bertoni <dbertoni@chromium.org> Commit-Queue: Solomon Kinard <solomonkinard@chromium.org> Cr-Commit-Position: refs/heads/main@{#1425781}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
4532250b53
commit
b2512cac2c
@ -169,24 +169,21 @@ bool IsResourceWebAccessibleImpl(
|
||||
const GURL& target_url,
|
||||
const std::optional<url::Origin>& initiator_origin,
|
||||
const GURL& upstream_url) {
|
||||
std::string relative_path = target_url.path();
|
||||
|
||||
// Set the initiator_url.
|
||||
GURL initiator_url;
|
||||
if (initiator_origin) {
|
||||
if (initiator_origin->opaque()) {
|
||||
initiator_url =
|
||||
initiator_origin->GetTupleOrPrecursorTupleIfOpaque().GetURL();
|
||||
} else {
|
||||
initiator_url = initiator_origin->GetURL();
|
||||
}
|
||||
}
|
||||
|
||||
const WebAccessibleResourcesInfo* info = GetResourcesInfo(&extension);
|
||||
if (!info) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Set the initiator_url.
|
||||
GURL initiator_url;
|
||||
if (initiator_origin) {
|
||||
initiator_url =
|
||||
initiator_origin->opaque()
|
||||
? initiator_origin->GetTupleOrPrecursorTupleIfOpaque().GetURL()
|
||||
: initiator_url = initiator_origin->GetURL();
|
||||
}
|
||||
|
||||
std::string relative_path = target_url.path();
|
||||
bool using_dynamic_url_extension_feature = base::FeatureList::IsEnabled(
|
||||
extensions_features::kExtensionDynamicURLRedirection);
|
||||
|
||||
|
Reference in New Issue
Block a user