Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

Unified Diff: chrome/utility/importer/bookmark_html_reader.cc

Issue 1220963005: Update base::StartsWith calls to new form (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@starts_with
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/utility/importer/bookmark_html_reader.cc
diff --git a/chrome/utility/importer/bookmark_html_reader.cc b/chrome/utility/importer/bookmark_html_reader.cc
index 0fa2c92cb4efaf453b3e0b49a75b1de561b49e37..1350512d4dd1d0134ef6b910d48d38f77f2a48aa 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))
Nico 2015/07/06 17:55:00 sure, let's treat tags as case-sensitive starting
+ 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))
Nico 2015/07/06 17:55:00 …or don't! I guess <DT><A is different from <DT><A
+ if (!base::StartsWith(line, kItemOpen, base::CompareCase::INSENSITIVE_ASCII))
return false;
// Find any close tag.

Powered by Google App Engine
This is Rietveld 408576698