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

chrome/browser/bookmarks/bookmark_manager_extension_api.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/bookmarks/bookmark_manager_extension_api.h"
 
 #include <vector>
 
 #include "base/json/json_writer.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_extension_api_constants.h"
 #include "chrome/browser/bookmarks/bookmark_extension_helpers.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/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/view_type_utils.h"
@@ skipping 191 matching lines @@
   if (bookmark_drag_data_.is_valid())
     return &bookmark_drag_data_;
   return NULL;
 }
 
 void BookmarkManagerExtensionEventRouter::ClearBookmarkNodeData() {
   bookmark_drag_data_.Clear();
 }
 
 bool ClipboardBookmarkManagerFunction::CopyOrCut(bool cut) {
-  BookmarkModel* model = profile()->GetBookmarkModel();
+  BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   std::vector<const BookmarkNode*> nodes;
   EXTENSION_FUNCTION_VALIDATE(GetNodesFromArguments(model, args_.get(),
                                                     0, &nodes));
   bookmark_utils::CopyToClipboard(model, nodes, cut);
   return true;
 }
 
 bool CopyBookmarkManagerFunction::RunImpl() {
   return CopyOrCut(false);
 }
 
 bool CutBookmarkManagerFunction::RunImpl() {
   if (!EditBookmarksEnabled())
     return false;
   return CopyOrCut(true);
 }
 
 bool PasteBookmarkManagerFunction::RunImpl() {
   if (!EditBookmarksEnabled())
     return false;
-  BookmarkModel* model = profile()->GetBookmarkModel();
+  BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   const BookmarkNode* parent_node = GetNodeFromArguments(model, args_.get());
   if (!parent_node) {
     error_ = keys::kNoParentError;
     return false;
   }
   bool can_paste = bookmark_utils::CanPasteFromClipboard(parent_node);
   if (!can_paste)
     return false;
 
   // We want to use the highest index of the selected nodes as a destination.
   std::vector<const BookmarkNode*> nodes;
   // No need to test return value, if we got an empty list, we insert at end.
   GetNodesFromArguments(model, args_.get(), 1, &nodes);
   int highest_index = -1;  // -1 means insert at end of list.
   for (size_t node = 0; node < nodes.size(); ++node) {
     // + 1 so that we insert after the selection.
     int this_node_index = parent_node->GetIndexOf(nodes[node]) + 1;
     if (this_node_index > highest_index)
       highest_index = this_node_index;
   }
 
   bookmark_utils::PasteFromClipboard(model, parent_node, highest_index);
   return true;
 }
 
 bool CanPasteBookmarkManagerFunction::RunImpl() {
   if (!EditBookmarksEnabled())
     return false;
-  BookmarkModel* model = profile()->GetBookmarkModel();
+  BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   const BookmarkNode* parent_node = GetNodeFromArguments(model, args_.get());
   if (!parent_node) {
     error_ = keys::kNoParentError;
     return false;
   }
   bool can_paste = bookmark_utils::CanPasteFromClipboard(parent_node);
   SetResult(Value::CreateBooleanValue(can_paste));
   return true;
 }
 
 bool SortChildrenBookmarkManagerFunction::RunImpl() {
   if (!EditBookmarksEnabled())
     return false;
-  BookmarkModel* model = profile()->GetBookmarkModel();
+  BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   const BookmarkNode* parent_node = GetNodeFromArguments(model, args_.get());
   if (!parent_node) {
     error_ = keys::kNoParentError;
     return false;
   }
   model->SortChildren(parent_node);
   return true;
 }
 
 bool BookmarkManagerGetStringsFunction::RunImpl() {
@@ skipping 75 matching lines @@
   // This is needed because unlike the rest of these functions, this class
   // inherits from AsyncFunction directly, rather than BookmarkFunction.
   SendResponse(true);
 
   return true;
 }
 
 bool StartDragBookmarkManagerFunction::RunImpl() {
   if (!EditBookmarksEnabled())
     return false;
-  BookmarkModel* model = profile()->GetBookmarkModel();
+  BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   std::vector<const BookmarkNode*> nodes;
   EXTENSION_FUNCTION_VALIDATE(
       GetNodesFromArguments(model, args_.get(), 0, &nodes));
 
   WebContents* web_contents =
       WebContents::FromRenderViewHost(render_view_host_);
   if (chrome::GetViewType(web_contents) == chrome::VIEW_TYPE_TAB_CONTENTS) {
     WebContents* web_contents =
         dispatcher()->delegate()->GetAssociatedWebContents();
     CHECK(web_contents);
     bookmark_utils::DragBookmarks(profile(), nodes,
                                   web_contents->GetNativeView());
 
     return true;
   } else {
     NOTREACHED();
     return false;
   }
 }
 
 bool DropBookmarkManagerFunction::RunImpl() {
   if (!EditBookmarksEnabled())
     return false;
 
-  BookmarkModel* model = profile()->GetBookmarkModel();
+  BookmarkModel* model =BookmarkModelFactory::GetForProfile(profile());
 
   int64 id;
   std::string id_string;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &id_string));
 
   if (!base::StringToInt64(id_string, &id)) {
     error_ = keys::kInvalidIdError;
     return false;
   }
 
@@ skipping 33 matching lines @@
 
     router->ClearBookmarkNodeData();
     return true;
   } else {
     NOTREACHED();
     return false;
   }
 }
 
 bool GetSubtreeBookmarkManagerFunction::RunImpl() {
-  BookmarkModel* model = profile()->GetBookmarkModel();
+  BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   const BookmarkNode* node;
   int64 id;
   std::string id_string;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &id_string));
   bool folders_only;
   EXTENSION_FUNCTION_VALIDATE(args_->GetBoolean(1, &folders_only));
   if (id_string == "") {
     node = model->root_node();
   } else {
      if (!base::StringToInt64(id_string, &id)) {
@@ skipping 33 matching lines @@
   bool can_open_new_windows = true;
 
 #if defined(OS_WIN)
   if (base::win::IsMetroProcess())
     can_open_new_windows = false;
 #endif  // OS_WIN
 
   SetResult(Value::CreateBooleanValue(can_open_new_windows));
   return true;
 }