Many fixes to bookmark importing.

chrome/browser/importer/safari_importer.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_IMPORTER_SAFARI_IMPORTER_H_
 #define CHROME_BROWSER_IMPORTER_SAFARI_IMPORTER_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 54 matching lines @@
   // Multiple URLs can share the same favicon; this is a map
   // of URLs -> IconIDs that we load as a temporary step before
   // actually loading the icons.
   typedef std::map<int64, std::set<GURL> > FaviconMap;
 
   void ImportBookmarks();
   void ImportPasswords();
   void ImportHistory();
 
   // Parse Safari's stored bookmarks.
-  void ParseBookmarks(std::vector<ProfileWriter::BookmarkEntry>* bookmarks);
+  void ParseBookmarks(const string16& toolbar_name,
+                      std::vector<ProfileWriter::BookmarkEntry>* bookmarks);
 
   // Function to recursively read Bookmarks out of Safari plist.
   // |bookmark_folder| The dictionary containing a folder to parse.
   // |parent_path_elements| Path elements up to this point.
   // |is_in_toolbar| Is this folder in the toolbar.
   // |out_bookmarks| BookMark element array to write into.
   void RecursiveReadBookmarksFolder(
       NSDictionary* bookmark_folder,
       const std::vector<string16>& parent_path_elements,
       bool is_in_toolbar,
+      const string16& toolbar_name,
       std::vector<ProfileWriter::BookmarkEntry>* out_bookmarks);
 
   // Converts history time stored by Safari as a double serialized as a string,
   // to seconds-since-UNIX-Ephoch-format used by Chrome.
   double HistoryTimeToEpochTime(NSString* history_time);
 
   // Parses Safari's history and loads it into the input array.
   void ParseHistoryItems(std::vector<history::URLRow>* history_items);
 
   // Opens the favicon database file.
   bool OpenDatabase(sql::Connection* db);
 
   // Loads the urls associated with the favicons into favicon_map;
   void ImportFaviconURLs(sql::Connection* db, FaviconMap* favicon_map);
 
   // Loads and reencodes the individual favicons.
   void LoadFaviconData(sql::Connection* db,
                        const FaviconMap& favicon_map,
                        std::vector<history::ImportedFaviconUsage>* favicons);
 
   FilePath library_dir_;
 
   DISALLOW_COPY_AND_ASSIGN(SafariImporter);
 };
 
 #endif  // CHROME_BROWSER_IMPORTER_SAFARI_IMPORTER_H_