Update base::StartsWith calls to new form

chrome/utility/importer/bookmark_html_reader.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/utility/importer/bookmark_html_reader.h"
 
 #include "base/callback.h"
 #include "base/files/file_util.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 101 matching lines @@
            (cancellation_callback.is_null() || !cancellation_callback.Run());
        ++i) {
     std::string line;
     base::TrimString(lines[i], " ", &line);
 
     // Remove "<HR>" if |line| starts with it. "<HR>" is the bookmark entries
     // separator in Firefox that Chrome does not support. Note that there can be
     // 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);
     }
 
     // Get the encoding of the bookmark file.
     if (internal::ParseCharsetFromLine(line, &charset))
       continue;
 
     // Get the folder name.
     if (internal::ParseFolderNameFromLine(line,
@@ skipping 65 matching lines @@
 
       // Save the favicon. DataURLToFaviconUsage will handle the case where
       // there is no favicon.
       if (favicons)
         DataURLToFaviconUsage(url, favicon, favicons);
 
       continue;
     }
 
     // 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);
         last_folder.clear();
       }
       if (last_folder_on_toolbar && !toolbar_folder_index)
         toolbar_folder_index = path.size();
 
       // 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>.
 
       base::string16 folder_title = path.back();
       path.pop_back();
 
       if (last_folder_is_empty) {
         // Empty folder should be added explicitly.
         ImportedBookmarkEntry entry;
         entry.is_folder = true;
@@ skipping 41 matching lines @@
   TemplateURLData data;
   data.SetURL(url_spec);
   *search_engine_url = url_spec;
   return TemplateURL(data).SupportsReplacement(SearchTermsData());
 }
 
 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);
     if (begin == std::string::npos)
       return false;
     begin += std::string(kCharset).size();
     size_t end = line.find_first_of('\"', begin);
     *charset = line.substr(begin, end - begin);
     return true;
   }
   return false;
 }
 
 bool ParseFolderNameFromLine(const std::string& line,
                              const std::string& charset,
                              base::string16* folder_name,
                              bool* is_toolbar_folder,
                              base::Time* add_date) {
   const char kFolderOpen[] = "<DT><H3";
   const char kFolderClose[] = "</H3>";
   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 halfway down this file!

+  if (!base::StartsWith(line, kFolderOpen, base::CompareCase::SENSITIVE))
     return false;
 
   size_t end = line.find(kFolderClose);
   size_t tag_end = line.rfind('>', end) + 1;
   // If no end tag or start tag is broken, we skip to find the folder name.
   if (end == std::string::npos || tag_end < arraysize(kFolderOpen))
     return false;
 
   base::CodepageToUTF16(line.substr(tag_end, end - tag_end), charset.c_str(),
                         base::OnStringConversionError::SKIP, folder_name);
@@ skipping 38 matching lines @@
   const char kAddDateAttribute[] = "ADD_DATE";
   const char kPostDataAttribute[] = "POST_DATA";
 
   title->clear();
   *url = GURL();
   *favicon = GURL();
   shortcut->clear();
   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);
   size_t tag_end = line.rfind('>', end) + 1;
   if (end == std::string::npos || tag_end < arraysize(kItemOpen))
     return false;  // No end tag or start tag is broken.
 
   std::string attribute_list = line.substr(arraysize(kItemOpen),
       tag_end - arraysize(kItemOpen) - 1);
 
@@ skipping 55 matching lines @@
                                   GURL* url) {
   const char kItemOpen[] = "<DT><A";
   const char kItemClose[] = "</";
   const char kHrefAttributeUpper[] = "HREF";
   const char kHrefAttributeLower[] = "href";
 
   title->clear();
   *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 further up.

+  if (!base::StartsWith(line, kItemOpen, base::CompareCase::INSENSITIVE_ASCII))
     return false;
 
   // Find any close tag.
   size_t end = line.find(kItemClose);
   size_t tag_end = line.rfind('>', end) + 1;
   if (end == std::string::npos || tag_end < arraysize(kItemOpen))
     return false;  // No end tag or start tag is broken.
 
   std::string attribute_list = line.substr(arraysize(kItemOpen),
       tag_end - arraysize(kItemOpen) - 1);
@@ skipping 18 matching lines @@
       *url = GURL(value);
     }
   }
 
   return true;
 }
 
 }  // namespace internal
 
 }  // namespace bookmark_html_reader