Move import in Mac OS X into its own process.

BUG=18774
TEST=import still works.
Review URL: http://codereview.chromium.org/502045

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48928 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/importer/toolbar_importer.h b/chrome/browser/importer/toolbar_importer.h
index 1f5bb483..0f31832 100644
--- a/chrome/browser/importer/toolbar_importer.h
+++ b/chrome/browser/importer/toolbar_importer.h
@@ -12,6 +12,7 @@
 #include <vector>
 
 #include "base/gtest_prod_util.h"
+#include "base/string16.h"
 #include "chrome/browser/importer/importer.h"
 #include "chrome/browser/importer/importer_data_types.h"
 #include "chrome/common/net/url_fetcher.h"
@@ -121,7 +122,8 @@
 
   static bool ParseBookmarksFromReader(
       XmlReader* reader,
-      std::vector<ProfileWriter::BookmarkEntry>* bookmarks);
+      std::vector<ProfileWriter::BookmarkEntry>* bookmarks,
+      const string16& bookmark_group_string);
 
   static bool LocateNextOpenTag(XmlReader* reader);
   static bool LocateNextTagByName(XmlReader* reader, const std::string& tag);
@@ -133,7 +135,8 @@
   static bool ExtractBookmarkInformation(
       XmlReader* reader,
       ProfileWriter::BookmarkEntry* bookmark_entry,
-      std::vector<BookmarkFolderType>* bookmark_folders);
+      std::vector<BookmarkFolderType>* bookmark_folders,
+      const string16& bookmark_group_string);
   static bool ExtractNamedValueFromXmlReader(XmlReader* reader,
                                              const std::string& name,
                                              std::string* buffer);
@@ -145,7 +148,8 @@
                                        ProfileWriter::BookmarkEntry* entry);
   static bool ExtractFoldersFromXmlReader(
       XmlReader* reader,
-      std::vector<BookmarkFolderType>* bookmark_folders);
+      std::vector<BookmarkFolderType>* bookmark_folders,
+      const string16& bookmark_group_string);
 
   // Bookmark creation is done by the method below.
   void AddBookmarksToChrome(