summaryrefslogtreecommitdiffstats
path: root/extensions/common/csp_validator.cc
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2015-08-11 12:30:22 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-11 19:31:27 +0000
commit8e2106dd88a61950569f9cfa8a94ad436d858658 (patch)
treeb95818b8b8d98565bc0beaae50ffb76fa3d82080 /extensions/common/csp_validator.cc
parent7d42dad6d95bf258c721f9d15f734bb9d0af8014 (diff)
downloadchromium_src-8e2106dd88a61950569f9cfa8a94ad436d858658.zip
chromium_src-8e2106dd88a61950569f9cfa8a94ad436d858658.tar.gz
chromium_src-8e2106dd88a61950569f9cfa8a94ad436d858658.tar.bz2
Convert remaining StringToLowerASCII to ToLowerASCII.
Remove StringToLowerASCII. This removes the template and makes a consistent call that can take a string piece. http_response_headers.cc in HttpResponseHeaders::RemoveHeaderLine there seemed to be a bug where it did std::string old_header_name_lowercase(name); where it actually meant std::string old_header_name_lowercase(old_header_name); I fixed this. There were a number of cases where url.host() or url.scheme() was passed to ToLowerASCII. These are already guaranteed lower-case, so I removed the call. There were a number of cases in net that did return ToLowerASCII().c_str() when the return type is a std::string, which is unnecessary and wasteful. I removed the c_str() call. NOPRESUBMIT=true (for touching code with wstrings) Review URL: https://codereview.chromium.org/1282363003 Cr-Commit-Position: refs/heads/master@{#342869}
Diffstat (limited to 'extensions/common/csp_validator.cc')
-rw-r--r--extensions/common/csp_validator.cc11
1 files changed, 3 insertions, 8 deletions
diff --git a/extensions/common/csp_validator.cc b/extensions/common/csp_validator.cc
index 842fc80..8f9406f 100644
--- a/extensions/common/csp_validator.cc
+++ b/extensions/common/csp_validator.cc
@@ -292,9 +292,7 @@ std::string SanitizeContentSecurityPolicy(
if (!tokenizer.GetNext())
continue;
- std::string directive_name = tokenizer.token();
- base::StringToLowerASCII(&directive_name);
-
+ std::string directive_name = base::ToLowerASCII(tokenizer.token_piece());
if (UpdateStatus(directive_name, &tokenizer, &default_src_status, options,
&sane_csp_parts, &default_src_csp_warnings))
continue;
@@ -348,17 +346,14 @@ bool ContentSecurityPolicyIsSandboxed(
if (!tokenizer.GetNext())
continue;
- std::string directive_name = tokenizer.token();
- base::StringToLowerASCII(&directive_name);
-
+ std::string directive_name = base::ToLowerASCII(tokenizer.token_piece());
if (directive_name != kSandboxDirectiveName)
continue;
seen_sandbox = true;
while (tokenizer.GetNext()) {
- std::string token = tokenizer.token();
- base::StringToLowerASCII(&token);
+ std::string token = base::ToLowerASCII(tokenizer.token_piece());
// The same origin token negates the sandboxing.
if (token == kAllowSameOriginToken)