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

chrome/browser/browser_commands_unittest.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/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 82 matching lines @@
   // Navigate to a url.
   GURL url1("http://foo/1");
   AddTab(browser(), url1);
   browser()->OpenURL(OpenURLParams(
       url1, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false));
 
   chrome::BookmarkCurrentPage(browser());
 
   // It should now be bookmarked in the bookmark model.
   EXPECT_EQ(profile(), browser()->profile());
-  EXPECT_TRUE(browser()->profile()->GetBookmarkModel()->IsBookmarked(url1));
+  EXPECT_TRUE(BookmarkModelFactory::GetForProfile(
+      browser()->profile())->IsBookmarked(url1));
 }
 
 // Tests back/forward in new tab (Control + Back/Forward button in the UI).
 TEST_F(BrowserCommandsTest, BackForwardInNewTab) {
   GURL url1("http://foo/1");
   GURL url2("http://foo/2");
 
   // Make a tab with the two pages navigated in it.
   AddTab(browser(), url1);
   NavigateAndCommitActiveTab(url2);
@@ skipping 48 matching lines @@
   ASSERT_EQ(url1, chrome::GetActiveWebContents(browser())->GetURL());
 
   // Same thing again for forward.
   // TODO(brettw) bug 11055: see the comment above about why we need this.
   CommitPendingLoad(&chrome::GetActiveWebContents(browser())->GetController());
   chrome::GoForward(browser(), NEW_FOREGROUND_TAB);
   ASSERT_EQ(4, browser()->active_index());
   ASSERT_EQ(url2, chrome::GetActiveWebContents(browser())->GetURL());
 }