Fix early return/DCHECK importing Safari bookmarks.

chrome/browser/importer/safari_importer.mm

 // Copyright (c) 2009 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/browser/importer/safari_importer.h"
 
 #include <map>
 #include <vector>
@@ skipping 161 matching lines @@
 
   NSString* type = [bookmark_folder objectForKey:@"WebBookmarkType"];
   NSString* title = [bookmark_folder objectForKey:@"Title"];
 
   // Are we the dictionary that contains all other bookmarks?
   // We need to know this so we don't add it to the path.
   bool is_top_level_bookmarks_container = [bookmark_folder
       objectForKey:@"WebBookmarkFileVersion"] != nil;
 
   // We're expecting a list of bookmarks here, if that isn't what we got, fail.
-  if (![type isEqualToString:@"WebBookmarkTypeList"] || !title) {
-    DCHECK(false) << "Type =("
-    << (type ? base::SysNSStringToUTF8(type) : "Null Type")
-    << ") Title=(" << (title ? base::SysNSStringToUTF8(title) : "Null title")
-    << ")";
-    return;
+  if (!is_top_level_bookmarks_container) {
+    // Top level containers sometimes don't have title attributes.
+    if (![type isEqualToString:@"WebBookmarkTypeList"] || !title) {
+      DCHECK(false) << "Type =("
+      << (type ? base::SysNSStringToUTF8(type) : "Null Type")
+      << ") Title=(" << (title ? base::SysNSStringToUTF8(title) : "Null title")
+      << ")";
+      return;
+    }
   }
 
   std::vector<std::wstring> path_elements(parent_path_elements);
   // Is this the toolbar folder?
   if ([title isEqualToString:@"BookmarksBar"]) {
     // Be defensive, the toolbar items shouldn't have a prepended path.
     path_elements.clear();
     is_in_toolbar = true;
   } else if ([title isEqualToString:@"BookmarksMenu"]) {
     // top level container for normal bookmarks.
@@ skipping 171 matching lines @@
   if (!homepage_ns.get())
     return;
 
   string16 hompeage_str = base::SysNSStringToUTF16(homepage_ns.get());
   GURL homepage(hompeage_str);
   if (homepage.is_valid()) {
     main_loop_->PostTask(FROM_HERE, NewRunnableMethod(writer_,
         &ProfileWriter::AddHomepage, homepage));
   }
 }