diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-13 16:48:41 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-13 16:50:48 +0000 |
| commit | df80704e21578c439a2facfdaeabfe016d297353 (patch) | |
| tree | 01092783052df5d2b027b80ec67011b5475e5c19 /extensions/common/csp_validator.cc | |
| parent | 5a25b4d1b753851cab3d5100d32bbc87ca4a4e4d (diff) | |
| download | chromium_src-df80704e21578c439a2facfdaeabfe016d297353.zip chromium_src-df80704e21578c439a2facfdaeabfe016d297353.tar.gz chromium_src-df80704e21578c439a2facfdaeabfe016d297353.tar.bz2 | |
Revert 289312 "Move StringToUpperASCII and LowerCaseEqualsASCII ..."
> Move StringToUpperASCII and LowerCaseEqualsASCII to the base namespace
>
> Convert LowerCaseEqualsASCII to take StringPiece. In the current patch this is
> generally a NOP but will allow me to delete the other 4 variants in a followup
> (wanted to do that separately since that will require more review, since
> callsites will be changed in nontrivial ways).
>
> In some cases, LowerCaseEqualsASCII is called with a WebString, which no
> longer is implicitly converted. I added base::string16(...) around such
> calls to force the right conversion. It happened in these files:
> window_container_type.cc
> savable_resources.cc
> render_view_impl.cc
> blink_ax_tree_source.cc
> password_form_conversion_utils.cc
> translate_helper.cc
> chrome_render_view_observer.cc
> dom_serializer_browsertest.cc
>
> R=jamesr@chromium.org
>
> Review URL: https://codereview.chromium.org/448143008
TBR=brettw@chromium.org
Review URL: https://codereview.chromium.org/474483002
Cr-Commit-Position: refs/heads/master@{#289320}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289320 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions/common/csp_validator.cc')
| -rw-r--r-- | extensions/common/csp_validator.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extensions/common/csp_validator.cc b/extensions/common/csp_validator.cc index c9f54b6..d19c7f2 100644 --- a/extensions/common/csp_validator.cc +++ b/extensions/common/csp_validator.cc @@ -66,9 +66,9 @@ bool HasOnlySecureTokens(base::StringTokenizer& tokenizer, if (source == "'self'" || source == "'none'" || source == "http://127.0.0.1" || - base::LowerCaseEqualsASCII(source, "blob:") || - base::LowerCaseEqualsASCII(source, "filesystem:") || - base::LowerCaseEqualsASCII(source, "http://localhost") || + LowerCaseEqualsASCII(source, "blob:") || + LowerCaseEqualsASCII(source, "filesystem:") || + LowerCaseEqualsASCII(source, "http://localhost") || StartsWithASCII(source, "http://127.0.0.1:", false) || StartsWithASCII(source, "http://localhost:", false) || StartsWithASCII(source, "https://", true) || |