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 92 matching lines @@
   bool has_subfolder = false;
   base::Time last_folder_add_date;
   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);

[Ilya Sherman, 2013/08/09 01:26:18]

nit: Please leave a blank line after this one.

[zhchbin, 2013/08/09 06:15:09]

Done.

+    // Remove "<HR>" if |line| starts with it. See http://crbug.com/257474.
+    if (StartsWithASCII(line, "<HR>", false))
+      TrimString(line.substr(4), " ", &line);

[Ilya Sherman, 2013/08/09 01:26:18]

Optional nit: I'd write this as follows, so that the '4' is not such a magical
constant:

const std::string kHrTag = "<HR>";
if (StartsWithASCII(line, kHrTag, false))
  TrimString(line.substr(kHrTag.size()), " ", &line);

[zhchbin, 2013/08/09 06:15:09]

Done.

 
     // 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,
@@ skipping 299 matching lines @@
       *url = GURL(value);
     }
   }
 
   return true;
 }
 
 }  // namespace internal
 
 }  // namespace bookmark_html_reader