Removing instances of profile_->GetBookmarkModel() as part of converting BookmarkModel to a PKS.

chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.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 <stack>
 
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h"
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_cell_single_line.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_tree_browser_cell.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
@@ skipping 265 matching lines @@
    releaseBarVisibilityForOwner:self withAnimation:YES delay:NO];
 }
 
 - (void)windowWillClose:(NSNotification*)notification {
   [self autorelease];
 }
 
 #pragma mark Folder Tree Management
 
 - (BookmarkModel*)bookmarkModel {
-  return profile_->GetBookmarkModel();
+  return BookmarkModelFactory::GetForProfile(profile_);
 }
 
 - (Profile*)profile {
   return profile_;
 }
 
 - (const BookmarkNode*)parentNode {
   return parentNode_;
 }
 
@@ skipping 118 matching lines @@
   [self willChangeValueForKey:@"okEnabled"];
   [self setTableSelectionPath:selectionPath];
   [self didChangeValueForKey:@"okEnabled"];
 }
 
 - (NSIndexPath*)selectionPathForNode:(const BookmarkNode*)desiredNode {
   // Back up the parent chaing for desiredNode, building up a stack
   // of ancestor nodes.  Then crawl down the folderTreeArray looking
   // for each ancestor in order while building up the selectionPath.
   std::stack<const BookmarkNode*> nodeStack;
-  BookmarkModel* model = profile_->GetBookmarkModel();
+  BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile_);
   const BookmarkNode* rootNode = model->root_node();
   const BookmarkNode* node = desiredNode;
   while (node != rootNode) {
     DCHECK(node);
     nodeStack.push(node);
     node = node->parent();
   }
   NSUInteger stackSize = nodeStack.size();
 
   NSIndexPath* path = nil;
@@ skipping 34 matching lines @@
         childFolders = [NSMutableArray arrayWithObject:folderInfo];
       else
         [childFolders addObject:folderInfo];
     }
   }
   return childFolders;
 }
 
 - (void)buildFolderTree {
   // Build up a tree of the current folder configuration.
-  BookmarkModel* model = profile_->GetBookmarkModel();
+  BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile_);
   const BookmarkNode* rootNode = model->root_node();
   NSMutableArray* baseArray = [self addChildFoldersFromNode:rootNode];
   DCHECK(baseArray);
   [self willChangeValueForKey:@"folderTreeArray"];
   folderTreeArray_.reset([baseArray retain]);
   [self didChangeValueForKey:@"folderTreeArray"];
 }
 
 - (void)modelChangedPreserveSelection:(BOOL)preserve {
   if (creatingNewFolders_)
@@ skipping 171 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