Mac/clang: Possibly contentious changes.

chrome/browser/cocoa/bookmark_editor_base_controller.mm

 // Copyright (c) 2010 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 <stack>
 
 #import "chrome/browser/cocoa/bookmark_editor_base_controller.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_mac.h"
 #include "base/logging.h"
@@ skipping 314 matching lines @@
     // If the tree is not showing then we use the original parent.
     selectedNode = parentNode_;
   }
   return selectedNode;
 }
 
 - (NSArray*)folderTreeArray {
   return folderTreeArray_.get();
 }
 
-- (void)setFolderTreeArray:(NSArray*)folderTreeArray {
-  folderTreeArray_.reset([folderTreeArray retain]);
-}
-
 - (NSArray*)tableSelectionPaths {
   return tableSelectionPaths_.get();
 }
 
 - (void)setTableSelectionPath:(NSIndexPath*)tableSelectionPath {
   [self setTableSelectionPaths:[NSArray arrayWithObject:tableSelectionPath]];
 }
 
 - (void)setTableSelectionPaths:(NSArray*)tableSelectionPaths {
   tableSelectionPaths_.reset([tableSelectionPaths retain]);
@@ skipping 64 matching lines @@
   }
   return childFolders;
 }
 
 - (void)buildFolderTree {
   // Build up a tree of the current folder configuration.
   BookmarkModel* model = profile_->GetBookmarkModel();
   const BookmarkNode* rootNode = model->root_node();
   NSMutableArray* baseArray = [self addChildFoldersFromNode:rootNode];
   DCHECK(baseArray);
-  [self setFolderTreeArray:baseArray];
+  folderTreeArray_.reset([baseArray retain]);
 }
 
 - (void)modelChangedPreserveSelection:(BOOL)preserve {
   const BookmarkNode* selectedNode = [self selectedNode];
   [self buildFolderTree];
   if (preserve &&
       selectedNode &&
       configuration_ == BookmarkEditor::SHOW_TREE)
     [self selectNodeInBrowser:selectedNode];
 }
@@ skipping 158 matching lines @@
 }
 
 // Implementing isEqual: allows the NSTreeController to preserve the selection
 // and open/shut state of outline items when the data changes.
 - (BOOL)isEqual:(id)other {
   return [other isKindOfClass:[BookmarkFolderInfo class]] &&
       folderNode_ == [(BookmarkFolderInfo*)other folderNode];
 }
 
 @end