Remove "<HR>" tags to import Firefox bookmarks correctly.

chrome/utility/importer/bookmark_html_reader.cc

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 5d34d7b191a817ce63ad6cf27df6cf68d6a56ce1..cb7b05048e3d456afec79ff1c9276ebd14667605 100644
--- a/chrome/utility/importer/bookmark_html_reader.cc
+++ b/chrome/utility/importer/bookmark_html_reader.cc
@@ -112,6 +112,15 @@ void ImportBookmarksFile(
     std::string line;
     TrimString(lines[i], " ", &line);
 
+    // Remove "<HR>" if |line| starts with it. "<HR>" is the bookmark entries
+    // separator in Firefox that Chrome does not support.
+    // See http://crbug.com/257474.
+    static const char kHrTag[] = "<HR>";
+    while (StartsWithASCII(line, kHrTag, false)) {

[gab, 2013/08/12 16:28:22]

Just noticed this change to a while loop (and saw your previous comment about
it), please update this comment to reflect this), something like:


    // 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.

[zhchbin, 2013/08/13 02:43:43]

Done.

+      line.erase(0, arraysize(kHrTag) - 1);
+      TrimString(line, " ", &line);
+    }
+
     // Get the encoding of the bookmark file.
     if (internal::ParseCharsetFromLine(line, &charset))
       continue;