Commit 7170a6c5 authored by Devlin Cronin's avatar Devlin Cronin Committed by Commit Bot

[Extensions] Remove more CSP handling for manifest V1 extensions

https://crrev.com/0832751d354f1ed576ee729d9a2a133c1f047dbf missed a bit.

Bug: 816677

Change-Id: I61216e400e1e5973ab9d8683c662269b84b9928f
Reviewed-on: https://chromium-review.googlesource.com/996386Reviewed-by: default avatarIstiaque Ahmed <lazyboy@chromium.org>
Commit-Queue: Devlin <rdevlin.cronin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548322}
parent fbe15b26
...@@ -136,15 +136,10 @@ bool CSPHandler::Parse(Extension* extension, base::string16* error) { ...@@ -136,15 +136,10 @@ bool CSPHandler::Parse(Extension* extension, base::string16* error) {
*error = base::ASCIIToUTF16(errors::kInvalidContentSecurityPolicy); *error = base::ASCIIToUTF16(errors::kInvalidContentSecurityPolicy);
return false; return false;
} }
std::string sanitized_csp; std::vector<InstallWarning> warnings;
if (extension->manifest_version() >= 2) { content_security_policy = SanitizeContentSecurityPolicy(
std::vector<InstallWarning> warnings; content_security_policy, GetValidatorOptions(extension), &warnings);
content_security_policy = extension->AddInstallWarnings(warnings);
SanitizeContentSecurityPolicy(content_security_policy,
GetValidatorOptions(extension),
&warnings);
extension->AddInstallWarnings(warnings);
}
extension->SetManifestData( extension->SetManifestData(
keys::kContentSecurityPolicy, keys::kContentSecurityPolicy,
......
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