Fix failed to import bookmarks from firefox

chrome/utility/importer/firefox_importer.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/firefox_importer.h"
 
 #include <memory>
 #include <set>
 
 #include "base/files/file_enumerator.h"
@@ skipping 633 matching lines @@
         search_engine_data->push_back(file_data);
       }
     }
   }
 }
 
 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()) {
     std::string folder = s.ColumnString(0);
     int id = s.ColumnInt(1);
     if (folder == kToolbarFolderName)
       *toolbar_folder_id = id;
     else if (folder == kMenuFolderName)
       *menu_folder_id = id;
     else if (folder == kUnsortedFolderName)
@@ skipping 116 matching lines @@
 
       if (!importer::ReencodeFavicon(&data[0], data.size(), &usage.png_data))
         continue;  // Unable to decode.
 
       usage.urls = i->second;
       favicons->push_back(usage);
     }
     s.Reset(true);
   }
 }