summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-13 16:23:25 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-13 16:25:00 +0000
commiteee3522979ae33c9ddc7ec33c769b2c3f0a48320 (patch)
tree46c85b8ad29772c08e4a423303128e976cb4b20f /webkit
parent67c87495f7b272a74ab1944af19202531b766b5b (diff)
downloadchromium_src-eee3522979ae33c9ddc7ec33c769b2c3f0a48320.zip
chromium_src-eee3522979ae33c9ddc7ec33c769b2c3f0a48320.tar.gz
chromium_src-eee3522979ae33c9ddc7ec33c769b2c3f0a48320.tar.bz2
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 Cr-Commit-Position: refs/heads/master@{#289312} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/common/fileapi/file_system_util.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/common/fileapi/file_system_util.cc b/webkit/common/fileapi/file_system_util.cc
index ded3457..4954688 100644
--- a/webkit/common/fileapi/file_system_util.cc
+++ b/webkit/common/fileapi/file_system_util.cc
@@ -422,8 +422,8 @@ bool CrackIsolatedFileSystemName(const std::string& filesystem_name,
// names, so we do a case insensitive compare by converting both strings
// to uppercase.
// TODO(benwells): Remove this when WebKit uses the same constant.
- start_token = StringToUpperASCII(start_token);
- std::string filesystem_name_upper = StringToUpperASCII(filesystem_name);
+ start_token = base::StringToUpperASCII(start_token);
+ std::string filesystem_name_upper = base::StringToUpperASCII(filesystem_name);
size_t pos = filesystem_name_upper.find(start_token);
if (pos == std::string::npos)
return false;