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

chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.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/gtk/bookmarks/bookmark_sub_menu_model_gtk.h"
 
 #include "base/stl_util.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/event_disposition.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h"
 #include "chrome/browser/ui/gtk/menu_gtk.h"
 #include "grit/generated_resources.h"
 #include "ui/base/gtk/menu_label_accelerator_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::OpenURLParams;
@@ skipping 128 matching lines @@
 }
 
 void BookmarkSubMenuModel::MenuWillShow() {
   menu_showing_ = true;
   Clear();
   AddCheckItemWithStringId(IDC_SHOW_BOOKMARK_BAR, IDS_SHOW_BOOKMARK_BAR);
   AddItemWithStringId(IDC_SHOW_BOOKMARK_MANAGER, IDS_BOOKMARK_MANAGER);
   AddItemWithStringId(IDC_IMPORT_SETTINGS, IDS_IMPORT_SETTINGS_MENU_LABEL);
   fixed_items_ = bookmark_end_ = GetItemCount();
   if (!model()) {
-    set_model(browser_->profile()->GetBookmarkModel());
+    set_model(BookmarkModelFactory::GetForProfile(browser_->profile()));
     if (!model())
       return;
     model()->AddObserver(this);
   }
   // We can't do anything further if the model isn't loaded yet.
   if (!model()->IsLoaded())
     return;
   // The node count includes the node itself, so 1 means empty.
   if (model()->bookmark_bar_node()->GetTotalNodeCount() > 1) {
     AddSeparator();
@@ skipping 49 matching lines @@
 
 bool BookmarkSubMenuModel::IsVisibleAt(int index) const {
   // We don't want the delegate interfering with bookmark items.
   return index >= fixed_items_ || SimpleMenuModel::IsVisibleAt(index);
 }
 
 // static
 bool BookmarkSubMenuModel::IsBookmarkItemCommandId(int command_id) {
   return command_id == kBookmarkItemCommandId;
 }