diff options
| author | brettw <brettw@chromium.org> | 2015-06-11 18:57:57 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-12 01:59:01 +0000 |
| commit | 44ce0ec5b05184c4e33d597d4e5a32d9f38b15c2 (patch) | |
| tree | 30eccdbbe72fb47810535fe56e0a8313be2db4b2 /components/mime_util | |
| parent | 57ca2cd795596162f06a6aa67367d8ce0d9ded52 (diff) | |
| download | chromium_src-44ce0ec5b05184c4e33d597d4e5a32d9f38b15c2.zip chromium_src-44ce0ec5b05184c4e33d597d4e5a32d9f38b15c2.tar.gz chromium_src-44ce0ec5b05184c4e33d597d4e5a32d9f38b15c2.tar.bz2 | |
Move StartsWith[ASCII] to base namespace.
NOPRESUBMIT=true
(no presubmit due to removing base:: from a ScopedAllowIO)
Review URL: https://codereview.chromium.org/1172183002
Cr-Commit-Position: refs/heads/master@{#334108}
Diffstat (limited to 'components/mime_util')
| -rw-r--r-- | components/mime_util/mime_util.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/components/mime_util/mime_util.cc b/components/mime_util/mime_util.cc index 5e5d004..3841fbb 100644 --- a/components/mime_util/mime_util.cc +++ b/components/mime_util/mime_util.cc @@ -161,9 +161,10 @@ bool MimeUtil::IsSupportedNonImageMimeType(const std::string& mime_type) const { #if !defined(OS_IOS) media::IsSupportedMediaMimeType(mime_type) || #endif - (StartsWithASCII(mime_type, "text/", false /* case insensitive */) && + (base::StartsWithASCII(mime_type, "text/", + false /* case insensitive */) && !IsUnsupportedTextMimeType(mime_type)) || - (StartsWithASCII(mime_type, "application/", false) && + (base::StartsWithASCII(mime_type, "application/", false) && net::MatchesMimeType("application/*+json", mime_type)); } @@ -178,7 +179,7 @@ bool MimeUtil::IsSupportedJavascriptMimeType( } bool MimeUtil::IsSupportedMimeType(const std::string& mime_type) const { - return (StartsWithASCII(mime_type, "image/", false) && + return (base::StartsWithASCII(mime_type, "image/", false) && IsSupportedImageMimeType(mime_type)) || IsSupportedNonImageMimeType(mime_type); } |