| Index: chrome/browser/importer/firefox2_importer.cc
|
| diff --git a/chrome/browser/importer/firefox2_importer.cc b/chrome/browser/importer/firefox2_importer.cc
|
| index 6b69db9c86c9a8d91d65e5c0ba105a661155da93..b14105aebb4c00bd01a0b458f8952dea2e41bdd8 100644
|
| --- a/chrome/browser/importer/firefox2_importer.cc
|
| +++ b/chrome/browser/importer/firefox2_importer.cc
|
| @@ -330,7 +330,7 @@ void Firefox2Importer::ImportBookmarks() {
|
| options |= ProfileWriter::IMPORT_TO_BOOKMARK_BAR;
|
| if (bookmark_bar_disabled())
|
| options |= ProfileWriter::BOOKMARK_BAR_DISABLED;
|
| - bridge_->AddBookmarkEntries(bookmarks, first_folder_name, options);
|
| + bridge_->AddBookmarks(bookmarks, first_folder_name, options);
|
| }
|
| if (!parsing_bookmarks_html_file_ && !template_urls.empty() &&
|
| !cancelled()) {
|
| @@ -338,9 +338,8 @@ void Firefox2Importer::ImportBookmarks() {
|
| } else {
|
| STLDeleteContainerPointers(template_urls.begin(), template_urls.end());
|
| }
|
| - if (!favicons.empty()) {
|
| + if (!favicons.empty())
|
| bridge_->SetFavicons(favicons);
|
| - }
|
| }
|
|
|
| void Firefox2Importer::ImportPasswords() {
|
|
|