Many fixes to bookmark importing.

In particular:
  * All bookmarks are imported to the toolbar -- nothing goes to Other Bookmarks.  If there are initially no bookmarks on the toolbar, we try to reduce nesting of the imported bookmarks as much as possible.  If there are already bookmarks on the toolbar, all the imported bookmarks end up in a new folder -- e.g. "Imported from Safari" -- on the toolbar.

  * All importers explicitly include a containing folder for bookmarks in the toolbar.
    o The ProfileWriter is responsible for stripping this folder off when the bookmarks should be imported directly to the toolbar.

  * All importers do *not* include a containing folder for the remaining bookmarks.
    o The ProfileWriter is responsible for creating this folder as appropriate.  In fact, this is how things used to work previously, too, since the folder name needed to be uniquified.  This CL makes the logic much clearer though (I hope).

  * All importers should now be able to handle importing empty folders.

  * The ProfileWriter no longer takes in a bitset of options for importing bookmarks.  These options were all either set identically by all clients, or could be more accurately computed locally.

  * Some implementation details for ProfileWriter have been removed from the header file.  Others have just been completely nuked from orbit, and replaced by simpler code (again, I hope).

BUG=79427,79433,71351
TEST=unit_tests --gtest_filter=*Import*

Review URL: http://codereview.chromium.org/6979007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86861 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 5 insertions, 10 deletions

diff --git a/chrome/profile_import/profile_import_thread.cc b/chrome/profile_import/profile_import_thread.cc
index 2472974..d98a2b0 100644
--- a/chrome/profile_import/profile_import_thread.cc
+++ b/chrome/profile_import/profile_import_thread.cc
@@ -54,8 +54,7 @@ bool ProfileImportThread::OnControlMessageReceived(const IPC::Message& msg) {
 void ProfileImportThread::OnImportStart(
     const importer::SourceProfile& source_profile,
     uint16 items,
-    const DictionaryValue& localized_strings,
-    bool import_to_bookmark_bar) {
+    const DictionaryValue& localized_strings) {
   bridge_ = new ExternalProcessImporterBridge(this, localized_strings);
   importer_ = importer::CreateImporterByType(source_profile.importer_type);
   if (!importer_) {
@@ -64,7 +63,6 @@ void ProfileImportThread::OnImportStart(
     return;
   }
 
-  importer_->set_import_to_bookmark_bar(import_to_bookmark_bar);
   items_to_import_ = items;
 
   // Create worker thread in which importer runs.
@@ -137,10 +135,9 @@ void ProfileImportThread::NotifyHomePageImportReady(
 
 void ProfileImportThread::NotifyBookmarksImportReady(
     const std::vector<ProfileWriter::BookmarkEntry>& bookmarks,
-    const string16& first_folder_name,
-    int options) {
+    const string16& first_folder_name) {
   Send(new ProfileImportProcessHostMsg_NotifyBookmarksImportStart(
-      first_folder_name, options, bookmarks.size()));
+      first_folder_name, bookmarks.size()));
 
   std::vector<ProfileWriter::BookmarkEntry>::const_iterator it;
   for (it = bookmarks.begin(); it < bookmarks.end();
diff --git a/chrome/profile_import/profile_import_thread.h b/chrome/profile_import/profile_import_thread.h
index a81b8164..3347d40 100644
--- a/chrome/profile_import/profile_import_thread.h
+++ b/chrome/profile_import/profile_import_thread.h
@@ -56,8 +56,7 @@ class ProfileImportThread : public ChildThread {
   void NotifyHomePageImportReady(const GURL& home_page);
   void NotifyBookmarksImportReady(
       const std::vector<ProfileWriter::BookmarkEntry>& bookmarks,
-      const string16& first_folder_name,
-      int options);
+      const string16& first_folder_name);
   void NotifyFaviconsImportReady(
       const std::vector<history::ImportedFaviconUsage>& favicons);
   void NotifyPasswordFormReady(const webkit_glue::PasswordForm& form);
@@ -76,8 +75,7 @@ class ProfileImportThread : public ChildThread {
   void OnImportStart(
       const importer::SourceProfile& source_profile,
       uint16 items,
-      const DictionaryValue& localized_strings,
-      bool import_to_bookmark_bar);
+      const DictionaryValue& localized_strings);
 
   // Calls cleanup to stop the import operation.
   void OnImportCancel();