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

chrome/browser/automation/testing_automation_provider.cc

Index: chrome/browser/automation/testing_automation_provider.cc
===================================================================
--- chrome/browser/automation/testing_automation_provider.cc	(revision 149222)
+++ chrome/browser/automation/testing_automation_provider.cc	(working copy)
@@ -39,6 +39,7 @@
 #include "chrome/browser/automation/automation_util.h"
 #include "chrome/browser/automation/automation_window_tracker.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/bookmark_storage.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
@@ -1362,12 +1363,13 @@
   if (browser_tracker_->ContainsHandle(handle)) {
     Browser* browser = browser_tracker_->GetResource(handle);
     if (browser) {
-      if (!browser->profile()->GetBookmarkModel()->IsLoaded()) {
+      BookmarkModel* bookmark_model =
+          BookmarkModelFactory::GetForProfile(browser->profile());
+      if (!bookmark_model->IsLoaded()) {
         return;
       }
       scoped_refptr<BookmarkStorage> storage(new BookmarkStorage(
-          browser->profile(),
-          browser->profile()->GetBookmarkModel()));
+          browser->profile(), bookmark_model));
       *success = storage->SerializeData(bookmarks_as_json);
     }
   }
@@ -1378,7 +1380,8 @@
     IPC::Message* reply_message) {
   if (browser_tracker_->ContainsHandle(handle)) {
     Browser* browser = browser_tracker_->GetResource(handle);
-    BookmarkModel* model = browser->profile()->GetBookmarkModel();
+    BookmarkModel* model =
+        BookmarkModelFactory::GetForProfile(browser->profile());
     if (model->IsLoaded()) {
       AutomationMsg_WaitForBookmarkModelToLoad::WriteReplyParams(
           reply_message, true);
@@ -1399,7 +1402,8 @@
   if (browser_tracker_->ContainsHandle(handle)) {
     Browser* browser = browser_tracker_->GetResource(handle);
     if (browser) {
-      BookmarkModel* model = browser->profile()->GetBookmarkModel();
+      BookmarkModel* model =
+          BookmarkModelFactory::GetForProfile(browser->profile());
       if (!model->IsLoaded()) {
         *success = false;
         return;
@@ -1427,7 +1431,8 @@
   if (browser_tracker_->ContainsHandle(handle)) {
     Browser* browser = browser_tracker_->GetResource(handle);
     if (browser) {
-      BookmarkModel* model = browser->profile()->GetBookmarkModel();
+      BookmarkModel* model =
+          BookmarkModelFactory::GetForProfile(browser->profile());
       if (!model->IsLoaded()) {
         *success = false;
         return;
@@ -1454,7 +1459,8 @@
   if (browser_tracker_->ContainsHandle(handle)) {
     Browser* browser = browser_tracker_->GetResource(handle);
     if (browser) {
-      BookmarkModel* model = browser->profile()->GetBookmarkModel();
+      BookmarkModel* model =
+          BookmarkModelFactory::GetForProfile(browser->profile());
       if (!model->IsLoaded()) {
         *success = false;
         return;
@@ -1479,7 +1485,8 @@
   if (browser_tracker_->ContainsHandle(handle)) {
     Browser* browser = browser_tracker_->GetResource(handle);
     if (browser) {
-      BookmarkModel* model = browser->profile()->GetBookmarkModel();
+      BookmarkModel* model =
+          BookmarkModelFactory::GetForProfile(browser->profile());
       if (!model->IsLoaded()) {
         *success = false;
         return;
@@ -1502,7 +1509,8 @@
   if (browser_tracker_->ContainsHandle(handle)) {
     Browser* browser = browser_tracker_->GetResource(handle);
     if (browser) {
-      BookmarkModel* model = browser->profile()->GetBookmarkModel();
+      BookmarkModel* model =
+          BookmarkModelFactory::GetForProfile(browser->profile());
       if (!model->IsLoaded()) {
         *success = false;
         return;
@@ -1524,7 +1532,8 @@
   if (browser_tracker_->ContainsHandle(handle)) {
     Browser* browser = browser_tracker_->GetResource(handle);
     if (browser) {
-      BookmarkModel* model = browser->profile()->GetBookmarkModel();
+      BookmarkModel* model =
+          BookmarkModelFactory::GetForProfile(browser->profile());
       if (!model->IsLoaded()) {
         *success = false;
         return;