diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-13 16:23:25 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-13 16:25:00 +0000 |
commit | eee3522979ae33c9ddc7ec33c769b2c3f0a48320 (patch) | |
tree | 46c85b8ad29772c08e4a423303128e976cb4b20f /chrome/utility | |
parent | 67c87495f7b272a74ab1944af19202531b766b5b (diff) | |
download | chromium_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 'chrome/utility')
-rw-r--r-- | chrome/utility/importer/bookmark_html_reader.cc | 2 | ||||
-rw-r--r-- | chrome/utility/importer/ie_importer_win.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/utility/importer/bookmark_html_reader.cc b/chrome/utility/importer/bookmark_html_reader.cc index 239a46e..368572f 100644 --- a/chrome/utility/importer/bookmark_html_reader.cc +++ b/chrome/utility/importer/bookmark_html_reader.cc @@ -293,7 +293,7 @@ bool ParseFolderNameFromLine(const std::string& line, } if (GetAttribute(attribute_list, kToolbarFolderAttribute, &value) && - LowerCaseEqualsASCII(value, "true")) + base::LowerCaseEqualsASCII(value, "true")) *is_toolbar_folder = true; else *is_toolbar_folder = false; diff --git a/chrome/utility/importer/ie_importer_win.cc b/chrome/utility/importer/ie_importer_win.cc index ccdcb1a..e3b463e 100644 --- a/chrome/utility/importer/ie_importer_win.cc +++ b/chrome/utility/importer/ie_importer_win.cc @@ -602,8 +602,8 @@ void IEImporter::ImportPasswordsIE6() { continue; GURL url(ac_list[i].key.c_str()); - if (!(LowerCaseEqualsASCII(url.scheme(), url::kHttpScheme) || - LowerCaseEqualsASCII(url.scheme(), url::kHttpsScheme))) { + if (!(base::LowerCaseEqualsASCII(url.scheme(), url::kHttpScheme) || + base::LowerCaseEqualsASCII(url.scheme(), url::kHttpsScheme))) { continue; } @@ -812,7 +812,7 @@ void IEImporter::ParseFavoritesFolder( for (std::vector<base::FilePath::StringType>::iterator it = file_list.begin(); it != file_list.end(); ++it) { base::FilePath shortcut(*it); - if (!LowerCaseEqualsASCII(shortcut.Extension(), ".url")) + if (!base::LowerCaseEqualsASCII(shortcut.Extension(), ".url")) continue; // Skip the bookmark with invalid URL. |