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

chrome/browser/bookmarks/bookmark_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_extension_api.h"
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/i18n/time_formatting.h"
 #include "base/json/json_writer.h"
 #include "base/path_service.h"
 #include "base/sha1.h"
 #include "base/stl_util.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_codec.h"
 #include "chrome/browser/bookmarks/bookmark_extension_api_constants.h"
 #include "chrome/browser/bookmarks/bookmark_extension_helpers.h"
 #include "chrome/browser/bookmarks/bookmark_html_writer.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_model_factory.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/extensions_quota_service.h"
 #include "chrome/browser/importer/importer_data_types.h"
 #include "chrome/browser/importer/importer_host.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
@@ skipping 41 matching lines @@
   file_util::ReplaceIllegalCharactersInPath(&filename, '_');
 
   FilePath default_path;
   PathService::Get(chrome::DIR_USER_DOCUMENTS, &default_path);
   return default_path.Append(filename);
 }
 
 }  // namespace
 
 void BookmarksFunction::Run() {
-  BookmarkModel* model = profile()->GetBookmarkModel();
+  BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   if (!model->IsLoaded()) {
     // Bookmarks are not ready yet.  We'll wait.
     registrar_.Add(
         this, chrome::NOTIFICATION_BOOKMARK_MODEL_LOADED,
         content::NotificationService::AllBrowserContextsAndSources());
     AddRef();  // Balanced in Observe().
     return;
   }
 
   bool success = RunImpl();
@@ skipping 23 matching lines @@
 }
 
 void BookmarksFunction::Observe(int type,
                                 const content::NotificationSource& source,
                                 const content::NotificationDetails& details) {
   DCHECK(type == chrome::NOTIFICATION_BOOKMARK_MODEL_LOADED);
   Profile* source_profile = content::Source<Profile>(source).ptr();
   if (!source_profile || !source_profile->IsSameProfile(profile()))
     return;
 
-  DCHECK(profile()->GetBookmarkModel()->IsLoaded());
+  DCHECK(BookmarkModelFactory::GetForProfile(profile())->IsLoaded());
   Run();
   Release();  // Balanced in Run().
 }
 
 BookmarkExtensionEventRouter::BookmarkExtensionEventRouter(
     BookmarkModel* model) : model_(model) {
 }
 
 BookmarkExtensionEventRouter::~BookmarkExtensionEventRouter() {
   if (model_) {
@@ skipping 315 matching lines @@
   int64 id;
   if (!base::StringToInt64(params->id, &id)) {
     error_ = keys::kInvalidIdError;
     return false;
   }
 
   bool recursive = false;
   if (name() == RemoveTreeBookmarkFunction::function_name())
     recursive = true;
 
-  BookmarkModel* model = profile()->GetBookmarkModel();
+  BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   if (!bookmark_extension_helpers::RemoveNode(model, id, recursive, &error_))
     return false;
 
   return true;
 }
 
 bool CreateBookmarkFunction::RunImpl() {
   if (!EditBookmarksEnabled())
     return false;
 
@@ skipping 79 matching lines @@
   scoped_ptr<bookmarks::Move::Params> params(
       bookmarks::Move::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   int64 id;
   if (!base::StringToInt64(params->id, &id)) {
     error_ = keys::kInvalidIdError;
     return false;
   }
 
-  BookmarkModel* model = profile()->GetBookmarkModel();
+  BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   const BookmarkNode* node = model->GetNodeByID(id);
   if (!node) {
     error_ = keys::kNoNodeError;
     return false;
   }
   if (model->is_permanent_node(node)) {
     error_ = keys::kModifySpecialError;
     return false;
   }
 
@@ skipping 128 matching lines @@
   virtual void GetBucketsForArgs(const ListValue* args, BucketList* buckets) {
     DictionaryValue* json;
     if (!args->GetDictionary(0, &json))
       return;
 
     std::string parent_id;
     if (json->HasKey(keys::kParentIdKey)) {
       if (!json->GetString(keys::kParentIdKey, &parent_id))
         return;
     }
-    BookmarkModel* model = profile_->GetBookmarkModel();
+    BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile_);
 
     int64 parent_id_int64;
     base::StringToInt64(parent_id, &parent_id_int64);
     const BookmarkNode* parent = model->GetNodeByID(parent_id_int64);
     if (!parent)
       return;
 
     std::string bucket_id = UTF16ToUTF8(parent->GetTitle());
     std::string title;
     json->GetString(keys::kTitleKey, &title);
@@ skipping 17 matching lines @@
   virtual void GetBucketsForArgs(const ListValue* args, BucketList* buckets) {
     typedef std::list<int64> IdList;
     IdList ids;
     bool invalid_id = false;
     if (!RemoveBookmarkFunction::ExtractIds(args, &ids, &invalid_id) ||
         invalid_id) {
       return;
     }
 
     for (IdList::iterator it = ids.begin(); it != ids.end(); ++it) {
-      BookmarkModel* model = profile_->GetBookmarkModel();
+      BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile_);
       const BookmarkNode* node = model->GetNodeByID(*it);
       if (!node || node->is_root())
         return;
 
       std::string bucket_id;
       bucket_id += UTF16ToUTF8(node->parent()->GetTitle());
       bucket_id += UTF16ToUTF8(node->GetTitle());
       bucket_id += node->url().spec();
       buckets->push_back(GetBucket(base::SHA1HashString(bucket_id)));
     }
@@ skipping 194 matching lines @@
                                            int index,
                                            void* params) {
 #if !defined(OS_ANDROID)
   // Android does not have support for the standard exporter.
   // TODO(jgreenwald): remove ifdef once extensions are no longer built on
   // Android.
   bookmark_html_writer::WriteBookmarks(profile(), path, NULL);
 #endif
   Release();  // Balanced in BookmarksIOFunction::SelectFile()
 }