Mac: Use native folder icons for the bookmark bar.

chrome/browser/cocoa/bookmark_bar_controller.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 "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #include "base/mac_util.h"
 #include "base/scoped_nsautorelease_pool.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
@@ skipping 50 matching lines @@
 @end
 
 @implementation BookmarkBarController
 
 - (void)folderImageLoaded:(NSImage*)folderImage {
   // The image loading thread retained |folderImage| already.
   folderImage_.reset(folderImage);
 
   for (NSObject* item in itemsPendingBookmarkIcon_.get()) {
     DCHECK([item respondsToSelector:@selector(setImage:)]);
-    if ([item respondsToSelector:@selector(setImage:)]) {
+    if ([item retainCount] > 1 &&
+        [item respondsToSelector:@selector(setImage:)]) {
       // |item| is not really of type |NSCell*|, but some type that responds to
       // |setImage:| is required to shut up a compiler warning.
       [(NSCell*)item setImage:folderImage_];
     }
   }
   itemsPendingBookmarkIcon_.reset(nil);
 }
 
 - (void)loadFolderImage:(NSObject*)ignored {
   base::ScopedNSAutoreleasePool pool;
@@ skipping 861 matching lines @@
   }
 
   const SkBitmap& favIcon = bookmarkModel_->GetFavIcon(node);
   if (!favIcon.isNull())
     return gfx::SkBitmapToNSImage(favIcon);
 
   return defaultImage_;
 }
 
 @end