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

chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc

 // 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 "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h"
 
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/bookmark_node_data.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/event_disposition.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/user_metrics.h"
@@ skipping 33 matching lines @@
   views::MenuButton* menu_button = bookmark_bar_->GetMenuButtonForNode(node_);
   DCHECK(menu_button);
   MenuItemView::AnchorPosition anchor;
   bookmark_bar_->GetAnchorPositionForButton(menu_button, &anchor);
   gfx::Point screen_loc;
   views::View::ConvertPointToScreen(menu_button, &screen_loc);
   // Subtract 1 from the height to make the popup flush with the button border.
   gfx::Rect bounds(screen_loc.x(), screen_loc.y(), menu_button->width(),
                    menu_button->height() - 1);
   for_drop_ = for_drop;
-  menu_delegate_->profile()->GetBookmarkModel()->AddObserver(this);
+  BookmarkModelFactory::GetForProfile(
+      menu_delegate_->profile())->AddObserver(this);
   // We only delete ourself after the menu completes, so we can safely ignore
   // the return value.
   ignore_result(menu_runner_->RunMenuAt(menu_delegate_->parent(), menu_button,
       bounds, anchor, for_drop ? views::MenuRunner::FOR_DROP : 0));
   if (!for_drop)
     delete this;
 }
 
 void BookmarkMenuController::Cancel() {
   menu_delegate_->menu()->Cancel();
@@ skipping 107 matching lines @@
 int BookmarkMenuController::GetMaxWidthForMenu(MenuItemView* view) {
   return menu_delegate_->GetMaxWidthForMenu(view);
 }
 
 void BookmarkMenuController::BookmarkModelChanged() {
   if (!menu_delegate_->is_mutating_model())
     menu()->Cancel();
 }
 
 BookmarkMenuController::~BookmarkMenuController() {
-  menu_delegate_->profile()->GetBookmarkModel()->RemoveObserver(this);
+  BookmarkModelFactory::GetForProfile(
+      menu_delegate_->profile())->RemoveObserver(this);
   if (observer_)
     observer_->BookmarkMenuDeleted(this);
 }