| Index: net/http/http_security_headers.cc
|
| diff --git a/net/http/http_security_headers.cc b/net/http/http_security_headers.cc
|
| index aff4a305a2902a9738693fca030dcd5e11703535..d95e5878d7c4ce10e2e393d875fb254257d5b6de 100644
|
| --- a/net/http/http_security_headers.cc
|
| +++ b/net/http/http_security_headers.cc
|
| @@ -197,13 +197,13 @@ bool ParseHSTSHeader(const std::string& value,
|
| switch (state) {
|
| case START:
|
| case DIRECTIVE_END:
|
| - if (IsAsciiWhitespace(*tokenizer.token_begin()))
|
| + if (base::IsAsciiWhitespace(*tokenizer.token_begin()))
|
| continue;
|
| - if (LowerCaseEqualsASCII(tokenizer.token(), "max-age")) {
|
| + if (base::LowerCaseEqualsASCII(tokenizer.token(), "max-age")) {
|
| state = AFTER_MAX_AGE_LABEL;
|
| max_age_observed++;
|
| - } else if (LowerCaseEqualsASCII(tokenizer.token(),
|
| - "includesubdomains")) {
|
| + } else if (base::LowerCaseEqualsASCII(tokenizer.token(),
|
| + "includesubdomains")) {
|
| state = AFTER_INCLUDE_SUBDOMAINS;
|
| include_subdomains_observed++;
|
| include_subdomains_candidate = true;
|
| @@ -213,7 +213,7 @@ bool ParseHSTSHeader(const std::string& value,
|
| break;
|
|
|
| case AFTER_MAX_AGE_LABEL:
|
| - if (IsAsciiWhitespace(*tokenizer.token_begin()))
|
| + if (base::IsAsciiWhitespace(*tokenizer.token_begin()))
|
| continue;
|
| if (*tokenizer.token_begin() != '=')
|
| return false;
|
| @@ -222,7 +222,7 @@ bool ParseHSTSHeader(const std::string& value,
|
| break;
|
|
|
| case AFTER_MAX_AGE_EQUALS:
|
| - if (IsAsciiWhitespace(*tokenizer.token_begin()))
|
| + if (base::IsAsciiWhitespace(*tokenizer.token_begin()))
|
| continue;
|
| unquoted = HttpUtil::Unquote(tokenizer.token());
|
| if (!MaxAgeToInt(unquoted.begin(), unquoted.end(), &max_age_candidate))
|
| @@ -232,7 +232,7 @@ bool ParseHSTSHeader(const std::string& value,
|
|
|
| case AFTER_MAX_AGE:
|
| case AFTER_INCLUDE_SUBDOMAINS:
|
| - if (IsAsciiWhitespace(*tokenizer.token_begin()))
|
| + if (base::IsAsciiWhitespace(*tokenizer.token_begin()))
|
| continue;
|
| else if (*tokenizer.token_begin() == ';')
|
| state = DIRECTIVE_END;
|
| @@ -296,20 +296,20 @@ bool ParseHPKPHeader(const std::string& value,
|
| equals.first = Strip(equals.first);
|
| equals.second = Strip(equals.second);
|
|
|
| - if (LowerCaseEqualsASCII(equals.first, "max-age")) {
|
| + if (base::LowerCaseEqualsASCII(equals.first, "max-age")) {
|
| if (equals.second.empty() ||
|
| !MaxAgeToInt(equals.second.begin(), equals.second.end(),
|
| &max_age_candidate)) {
|
| return false;
|
| }
|
| parsed_max_age = true;
|
| - } else if (LowerCaseEqualsASCII(equals.first, "pin-sha1")) {
|
| + } else if (base::LowerCaseEqualsASCII(equals.first, "pin-sha1")) {
|
| if (!ParseAndAppendPin(equals.second, HASH_VALUE_SHA1, &pins))
|
| return false;
|
| - } else if (LowerCaseEqualsASCII(equals.first, "pin-sha256")) {
|
| + } else if (base::LowerCaseEqualsASCII(equals.first, "pin-sha256")) {
|
| if (!ParseAndAppendPin(equals.second, HASH_VALUE_SHA256, &pins))
|
| return false;
|
| - } else if (LowerCaseEqualsASCII(equals.first, "includesubdomains")) {
|
| + } else if (base::LowerCaseEqualsASCII(equals.first, "includesubdomains")) {
|
| include_subdomains_candidate = true;
|
| } else {
|
| // Silently ignore unknown directives for forward compatibility.
|
|
|