Mac/clang: Possibly contentious changes.

chrome/browser/cocoa/bookmark_editor_base_controller.mm

Index: chrome/browser/cocoa/bookmark_editor_base_controller.mm
diff --git a/chrome/browser/cocoa/bookmark_editor_base_controller.mm b/chrome/browser/cocoa/bookmark_editor_base_controller.mm
index be367aecdd841e3c80fe61b957f9165b54f6ba5e..51612cebbd8ef7b19ec03cf12a572809804514e4 100644
--- a/chrome/browser/cocoa/bookmark_editor_base_controller.mm
+++ b/chrome/browser/cocoa/bookmark_editor_base_controller.mm
@@ -332,10 +332,6 @@ class BookmarkEditorBaseControllerBridge : public BookmarkModelObserver {
   return folderTreeArray_.get();
 }
 
-- (void)setFolderTreeArray:(NSArray*)folderTreeArray {
-  folderTreeArray_.reset([folderTreeArray retain]);
-}
-
 - (NSArray*)tableSelectionPaths {
   return tableSelectionPaths_.get();
 }
@@ -420,7 +416,7 @@ class BookmarkEditorBaseControllerBridge : public BookmarkModelObserver {
   const BookmarkNode* rootNode = model->root_node();
   NSMutableArray* baseArray = [self addChildFoldersFromNode:rootNode];
   DCHECK(baseArray);
-  [self setFolderTreeArray:baseArray];
+  folderTreeArray_.reset([baseArray retain]);
 }
 
 - (void)modelChangedPreserveSelection:(BOOL)preserve {