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

chrome/browser/sync/test/integration/bookmarks_helper.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/sync/test/integration/bookmarks_helper.h"
 
 #include "base/compiler_specific.h"
 #include "base/rand_util.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
@@ skipping 256 matching lines @@
 
 const BookmarkNode* GetOtherNode(int index) {
   return GetBookmarkModel(index)->other_node();
 }
 
 const BookmarkNode* GetSyncedBookmarksNode(int index) {
   return GetBookmarkModel(index)->mobile_node();
 }
 
 BookmarkModel* GetVerifierBookmarkModel() {
-  return test()->verifier()->GetBookmarkModel();
+  return BookmarkModelFactory::GetForProfile(test()->verifier());
 }
 
 const BookmarkNode* AddURL(int profile,
                            const std::wstring& title,
                            const GURL& url) {
   return AddURL(profile, GetBookmarkBarNode(profile), 0, title,  url);
 }
 
 const BookmarkNode* AddURL(int profile,
                            int index,
@@ skipping 312 matching lines @@
 
 std::wstring IndexedSubfolderName(int i) {
   return StringPrintf(L"Subfolder Name %d", i);
 }
 
 std::wstring IndexedSubsubfolderName(int i) {
   return StringPrintf(L"Subsubfolder Name %d", i);
 }
 
 }  // namespace bookmarks_helper