[Import] [OSX] Don't create an empty folder when importing from Safari with an empty Bookmarks Menu.

chrome/utility/importer/safari_importer.mm

 // Copyright (c) 2012 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 <Cocoa/Cocoa.h>
 
 #include "chrome/utility/importer/safari_importer.h"
 
 #include <map>
 #include <vector>
@@ skipping 176 matching lines @@
       NOTREACHED() << "Type=("
                    << (type ? base::SysNSStringToUTF8(type) : "Null type")
                    << ") Title=("
                    << (title ? base::SysNSStringToUTF8(title) : "Null title")
                    << ")";
       return;
     }
   }
 
   NSArray* elements = [bookmark_folder objectForKey:@"Children"];
-  if (!elements && (!parent_path_elements.empty() || !is_in_toolbar)) {
-    // This is an empty folder, so add it explicitly; but don't add the toolbar
-    // folder if it is empty.  Note that all non-empty folders are added
+  if (!elements &&
+      (!parent_path_elements.empty() || !is_in_toolbar) &&
+      ![title isEqualToString:@"BookmarksMenu"]) {
+    // This is an empty folder, so add it explicitly.  Note that the condition
+    // above prevents either the toolbar folder or the bookmarks menu from being
+    // added if either is empty.  Note also that all non-empty folders are added
     // implicitly when their children are added.
     ImportedBookmarkEntry entry;
     // Safari doesn't specify a creation time for the folder.
     entry.creation_time = base::Time::Now();
     entry.title = base::SysNSStringToUTF16(title);
     entry.path = parent_path_elements;
     entry.in_toolbar = is_in_toolbar;
     entry.is_folder = true;
 
     out_bookmarks->push_back(entry);
@@ skipping 159 matching lines @@
     if (!last_visit_str)
       continue;
 
     // Convert Safari's last visit time to Unix Epoch time.
     double seconds_since_unix_epoch = HistoryTimeToEpochTime(last_visit_str);
     row.last_visit = base::Time::FromDoubleT(seconds_since_unix_epoch);
 
     history_items->push_back(row);
   }
 }