summaryrefslogtreecommitdiffstats
path: root/chrome/utility
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2015-07-06 12:29:40 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-06 19:31:11 +0000
commit66d1b81be3d04396da1e92026274a03fa627e933 (patch)
tree5e40664c31d8837d92dd19d879ffc46b98a3b165 /chrome/utility
parent32b942d7c5512a09343b91d544e95ac58727f505 (diff)
downloadchromium_src-66d1b81be3d04396da1e92026274a03fa627e933.zip
chromium_src-66d1b81be3d04396da1e92026274a03fa627e933.tar.gz
chromium_src-66d1b81be3d04396da1e92026274a03fa627e933.tar.bz2
Update StartsWith calls to use new versions in chrome and content
true -> base::CompareCase::SENSITIVE false with punctuation only -> base::CompareCase::SENSITIVE false with ascii constants -> base::CompareCase::INSENSITIVE_ASCII false with arbitrary string16 -> base::CompareCase::SENSITIVE with base::i18n::ToLower() on the arguments. BUG=506920, 506255 Review URL: https://codereview.chromium.org/1214183008 Cr-Commit-Position: refs/heads/master@{#337439}
Diffstat (limited to 'chrome/utility')
-rw-r--r--chrome/utility/importer/bookmark_html_reader.cc16
-rw-r--r--chrome/utility/media_galleries/media_metadata_parser.cc6
-rw-r--r--chrome/utility/media_galleries/picasa_album_table_reader.cc3
3 files changed, 14 insertions, 11 deletions
diff --git a/chrome/utility/importer/bookmark_html_reader.cc b/chrome/utility/importer/bookmark_html_reader.cc
index 0fa2c92..1350512 100644
--- a/chrome/utility/importer/bookmark_html_reader.cc
+++ b/chrome/utility/importer/bookmark_html_reader.cc
@@ -119,7 +119,8 @@ void ImportBookmarksFile(
// multiple "<HR>" tags at the beginning of a single line.
// See http://crbug.com/257474.
static const char kHrTag[] = "<HR>";
- while (base::StartsWithASCII(line, kHrTag, false)) {
+ while (base::StartsWith(line, kHrTag,
+ base::CompareCase::INSENSITIVE_ASCII)) {
line.erase(0, arraysize(kHrTag) - 1);
base::TrimString(line, " ", &line);
}
@@ -205,7 +206,7 @@ void ImportBookmarksFile(
}
// Bookmarks in sub-folder are encapsulated with <DL> tag.
- if (base::StartsWithASCII(line, "<DL>", false)) {
+ if (base::StartsWith(line, "<DL>", base::CompareCase::INSENSITIVE_ASCII)) {
has_subfolder = true;
if (!last_folder.empty()) {
path.push_back(last_folder);
@@ -216,7 +217,8 @@ void ImportBookmarksFile(
// Mark next folder empty as initial state.
last_folder_is_empty = true;
- } else if (base::StartsWithASCII(line, "</DL>", false)) {
+ } else if (base::StartsWith(line, "</DL>",
+ base::CompareCase::INSENSITIVE_ASCII)) {
if (path.empty())
break; // Mismatch <DL>.
@@ -278,7 +280,7 @@ namespace internal {
bool ParseCharsetFromLine(const std::string& line, std::string* charset) {
const char kCharset[] = "charset=";
- if (base::StartsWithASCII(line, "<META", false) &&
+ if (base::StartsWith(line, "<META", base::CompareCase::INSENSITIVE_ASCII) &&
(line.find("CONTENT=\"") != std::string::npos ||
line.find("content=\"") != std::string::npos)) {
size_t begin = line.find(kCharset);
@@ -302,7 +304,7 @@ bool ParseFolderNameFromLine(const std::string& line,
const char kToolbarFolderAttribute[] = "PERSONAL_TOOLBAR_FOLDER";
const char kAddDateAttribute[] = "ADD_DATE";
- if (!base::StartsWithASCII(line, kFolderOpen, true))
+ if (!base::StartsWith(line, kFolderOpen, base::CompareCase::SENSITIVE))
return false;
size_t end = line.find(kFolderClose);
@@ -361,7 +363,7 @@ bool ParseBookmarkFromLine(const std::string& line,
post_data->clear();
*add_date = base::Time();
- if (!base::StartsWithASCII(line, kItemOpen, true))
+ if (!base::StartsWith(line, kItemOpen, base::CompareCase::SENSITIVE))
return false;
size_t end = line.find(kItemClose);
@@ -437,7 +439,7 @@ bool ParseMinimumBookmarkFromLine(const std::string& line,
*url = GURL();
// Case-insensitive check of open tag.
- if (!base::StartsWithASCII(line, kItemOpen, false))
+ if (!base::StartsWith(line, kItemOpen, base::CompareCase::INSENSITIVE_ASCII))
return false;
// Find any close tag.
diff --git a/chrome/utility/media_galleries/media_metadata_parser.cc b/chrome/utility/media_galleries/media_metadata_parser.cc
index a39324e..b1fb81c 100644
--- a/chrome/utility/media_galleries/media_metadata_parser.cc
+++ b/chrome/utility/media_galleries/media_metadata_parser.cc
@@ -166,8 +166,8 @@ MediaMetadataParser::MediaMetadataParser(media::DataSource* source,
MediaMetadataParser::~MediaMetadataParser() {}
void MediaMetadataParser::Start(const MetadataCallback& callback) {
- if (base::StartsWithASCII(mime_type_, "audio/", true) ||
- base::StartsWithASCII(mime_type_, "video/", true)) {
+ if (base::StartsWith(mime_type_, "audio/", base::CompareCase::SENSITIVE) ||
+ base::StartsWith(mime_type_, "video/", base::CompareCase::SENSITIVE)) {
MediaMetadata* metadata = new MediaMetadata;
metadata->mime_type = mime_type_;
std::vector<AttachedImage>* attached_images =
@@ -183,7 +183,7 @@ void MediaMetadataParser::Start(const MetadataCallback& callback) {
return;
}
- if (base::StartsWithASCII(mime_type_, "image/", true)) {
+ if (base::StartsWith(mime_type_, "image/", base::CompareCase::SENSITIVE)) {
ImageMetadataExtractor* extractor = new ImageMetadataExtractor;
extractor->Extract(
source_,
diff --git a/chrome/utility/media_galleries/picasa_album_table_reader.cc b/chrome/utility/media_galleries/picasa_album_table_reader.cc
index 94b4aa5..2deba4e 100644
--- a/chrome/utility/media_galleries/picasa_album_table_reader.cc
+++ b/chrome/utility/media_galleries/picasa_album_table_reader.cc
@@ -91,7 +91,8 @@ bool PicasaAlbumTableReader::Init() {
if (category == kAlbumCategoryAlbum) {
std::string token;
if (!token_column.ReadString(i, &token) || token.empty() ||
- !base::StartsWithASCII(token, kAlbumTokenPrefix, false)) {
+ !base::StartsWith(token, kAlbumTokenPrefix,
+ base::CompareCase::INSENSITIVE_ASCII)) {
continue;
}