Index: chrome/utility/importer/firefox_importer.cc |
diff --git a/chrome/utility/importer/firefox_importer.cc b/chrome/utility/importer/firefox_importer.cc |
index e487c92e507e10b1c7c63930d045b68a66899d29..7ee34d45a41b1d0e3cc3665bba0f462de8f2dbf1 100644 |
--- a/chrome/utility/importer/firefox_importer.cc |
+++ b/chrome/utility/importer/firefox_importer.cc |
@@ -651,11 +651,12 @@ void FirefoxImporter::LoadRootNodeID(sql::Connection* db, |
int* toolbar_folder_id, |
int* menu_folder_id, |
int* unsorted_folder_id) { |
- static const char kToolbarFolderName[] = "toolbar"; |
- static const char kMenuFolderName[] = "menu"; |
- static const char kUnsortedFolderName[] = "unfiled"; |
+ static const char kToolbarFolderName[] = "Bookmarks Toolbar"; |
+ static const char kMenuFolderName[] = "Bookmarks Menu"; |
+ static const char kUnsortedFolderName[] = "Other Bookmarks"; |
- const char query[] = "SELECT root_name, folder_id FROM moz_bookmarks_roots"; |
+ const char query[] = "SELECT b.title, b.id FROM moz_bookmarks b " |
+ "WHERE b.type = 2"; |
sql::Statement s(db->GetUniqueStatement(query)); |
while (s.Step()) { |