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

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/file_util.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 94 matching lines @@
   std::vector<base::string16> path;
   size_t toolbar_folder_index = 0;
   std::string charset;
   for (size_t i = 0;
        i < lines.size() &&
            (cancellation_callback.is_null() || !cancellation_callback.Run());
        ++i) {
     std::string line;
     TrimString(lines[i], " ", &line);
 
+    // Remove "<HR>" if |line| starts with it. "<HR>" is the separator for
+    // bookmark entrys in Firefox that Chrome does not support.

[gab, 2013/08/12 14:17:41]

I would rephrase the last sentence as:

"<HR>" is the bookmark separator in Firefox that Chrome does not support

(otherwise it makes it feel like its the "bookmark entries" we don't support...)

WDYT?

[zhchbin, 2013/08/12 14:42:09]

Done.

Sorry for my poor English.

+    // See http://crbug.com/257474.
+    static const char kHrTag[] = "<HR>";
+    while (StartsWithASCII(line, kHrTag, false)) {
+      line.erase(0, arraysize(kHrTag) - 1);
+      TrimString(line, " ", &line);
+    }
+
     // Get the encoding of the bookmark file.
     if (internal::ParseCharsetFromLine(line, &charset))
       continue;
 
     // Get the folder name.
     if (internal::ParseFolderNameFromLine(line,
                                           charset,
                                           &last_folder,
                                           &last_folder_on_toolbar,
                                           &last_folder_add_date)) {
@@ skipping 298 matching lines @@
       *url = GURL(value);
     }
   }
 
   return true;
 }
 
 }  // namespace internal
 
 }  // namespace bookmark_html_reader