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 74 matching lines @@
 }  // namespace
 
 namespace bookmark_html_reader {
 
 void ImportBookmarksFile(
       const base::Callback<bool(void)>& cancellation_callback,
       const base::Callback<bool(const GURL&)>& valid_url_callback,
       const base::FilePath& file_path,
       std::vector<ImportedBookmarkEntry>* bookmarks,
       std::vector<ImportedFaviconUsage>* favicons) {
+  const std::string kHrTag = "<HR>";

[gab, 2013/08/09 13:27:30]

All string constants should be of the form: 

static const char kFoo[] = "...";

so that they live in ro-data in the binary.


Also the constant should be as close as possible to the code that uses it (i.e.,
between 116/117 below).

   std::string content;
   file_util::ReadFileToString(file_path, &content);
   std::vector<std::string> lines;
   base::SplitString(content, '\n', &lines);
 
   base::string16 last_folder;
   bool last_folder_on_toolbar = false;
   bool last_folder_is_empty = true;
   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);
 
+    // Remove "<HR>" if |line| starts with it. See http://crbug.com/257474.
+    if (StartsWithASCII(line, kHrTag, false))
+      TrimString(line.substr(kHrTag.size()), " ", &line);

[gab, 2013/08/09 13:27:30]

use "arraysize(kHrTag)" here instead of kHrTag.size() since it will now be a
char array.

[gab, 2013/08/09 13:27:30]

This line is slightly tricky and it creates a new string which I think can be
avoided by splitting the logic as:

line.erase(0, arraysize(kHrTag))
TrimString(line, " ", &line);

which on top of being more explicit avoids creating a new string (which the
substr command otherwise does).

[zhchbin, 2013/08/09 14:20:00]

Can you accept

line.erase(0, arraysize(kHrTag) - 1);

arraysize(kHrTag) is 5.

[gab, 2013/08/09 14:29:03]

Ah, right, yes, because the actual arraysize includes the terminating-NULL
character. Good catch.

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