Fix Firefox bookmarks import.

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 187 matching lines @@
 void FirefoxImporter::ImportBookmarks() {
   base::FilePath file = source_path_.AppendASCII("places.sqlite");
   if (!base::PathExists(file))
     return;
 
   sql::Connection db;
   if (!db.Open(file))
     return;
 
   // Get the bookmark folders that we are interested in.
-  int toolbar_folder_id = -1;
-  int menu_folder_id = -1;
-  int unsorted_folder_id = -1;
-  LoadRootNodeID(&db, &toolbar_folder_id, &menu_folder_id, &unsorted_folder_id);
+  int toolbar_folder_id = LoadNodeIDByGUID(&db, "toolbar_____");
+  int menu_folder_id = LoadNodeIDByGUID(&db, "menu________");
+  int unsorted_folder_id = LoadNodeIDByGUID(&db, "unfiled_____");
 
   // Load livemark IDs.
   std::set<int> livemark_id;
   LoadLivemarkIDs(&db, &livemark_id);
 
   // Load the default bookmarks.
   std::set<GURL> default_urls;
   LoadDefaultBookmarks(app_path_, &default_urls);
 
   BookmarkList list;
@@ skipping 418 matching lines @@
           size_t end_of_parent = file_data.find("</SearchPlugin>");
           if (end_of_parent != std::string::npos && !alias.empty())
             file_data.insert(end_of_parent, "<Alias>" + alias + "</Alias> \n");
         }
         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";
+int FirefoxImporter::LoadNodeIDByGUID(sql::Connection* db,
+                                      const std::string& GUID) {
+  const char query[] =
+      "SELECT id "
+      "FROM moz_bookmarks "
+      "WHERE guid == ?";
+  sql::Statement s(db->GetUniqueStatement(query));
+  s.BindString(0, GUID);
 
-  const char query[] = "SELECT root_name, folder_id FROM moz_bookmarks_roots";
-  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)
-      *unsorted_folder_id = id;
-  }
+  if (!s.Step())
+    return -1;
+  return s.ColumnInt(0);
 }
 
 void FirefoxImporter::LoadLivemarkIDs(sql::Connection* db,
                                        std::set<int>* livemark) {
   static const char kFeedAnnotation[] = "livemark/feedURI";
   livemark->clear();
 
   const char query[] =
       "SELECT b.item_id "
       "FROM moz_anno_attributes a "
@@ skipping 104 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);
   }
 }