Use BookmarkModelFactory::GetForBrowserContext everywhere

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 <stddef.h>
 
 #include <set>
 #include <vector>
@@ skipping 237 matching lines @@
   return FaviconData(model->GetFavicon(node), node->icon_url());
 }
 
 // Sets the favicon for |profile| and |node|. |profile| may be
 // |test()->verifier()|.
 void SetFaviconImpl(Profile* profile,
                     const BookmarkNode* node,
                     const GURL& icon_url,
                     const gfx::Image& image,
                     bookmarks_helper::FaviconSource favicon_source) {
-    BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile);
+  BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile);
 
-    FaviconChangeObserver observer(model, node);
-    favicon::FaviconService* favicon_service =
-        FaviconServiceFactory::GetForProfile(
-            profile, ServiceAccessType::EXPLICIT_ACCESS);
-    if (favicon_source == bookmarks_helper::FROM_UI) {
-      favicon_service->SetFavicons(
-          node->url(), icon_url, favicon_base::FAVICON, image);
+  FaviconChangeObserver observer(model, node);
+  favicon::FaviconService* favicon_service =
+      FaviconServiceFactory::GetForProfile(profile,
+                                           ServiceAccessType::EXPLICIT_ACCESS);
+  if (favicon_source == bookmarks_helper::FROM_UI) {
+    favicon_service->SetFavicons(node->url(), icon_url, favicon_base::FAVICON,
+                                 image);
     } else {
       ProfileSyncService* pss =
           ProfileSyncServiceFactory::GetForProfile(profile);
       browser_sync::BookmarkChangeProcessor::ApplyBookmarkFavicon(
           node, pss->GetSyncClient(), icon_url, image.As1xPNGBytes());
     }
 
     // Wait for the favicon for |node| to be invalidated.
     observer.WaitForSetFavicon();
     // Wait for the BookmarkModel to fetch the updated favicon and for the new
@@ skipping 170 matching lines @@
   ASSERT_TRUE(NodesMatch(foreign_node, walker));
   *result = walker;
 }
 
 }  // namespace
 
 
 namespace bookmarks_helper {
 
 BookmarkModel* GetBookmarkModel(int index) {
-  return BookmarkModelFactory::GetForProfile(
+  return BookmarkModelFactory::GetForBrowserContext(
       sync_datatype_helper::test()->GetProfile(index));
 }
 
 const BookmarkNode* GetBookmarkBarNode(int index) {
   return GetBookmarkModel(index)->bookmark_bar_node();
 }
 
 const BookmarkNode* GetOtherNode(int index) {
   return GetBookmarkModel(index)->other_node();
 }
 
 const BookmarkNode* GetSyncedBookmarksNode(int index) {
   return GetBookmarkModel(index)->mobile_node();
 }
 
 const BookmarkNode* GetManagedNode(int index) {
   return ManagedBookmarkServiceFactory::GetForProfile(
              sync_datatype_helper::test()->GetProfile(index))
       ->managed_node();
 }
 
 BookmarkModel* GetVerifierBookmarkModel() {
-  return BookmarkModelFactory::GetForProfile(
+  return BookmarkModelFactory::GetForBrowserContext(
       sync_datatype_helper::test()->verifier());
 }
 
 const BookmarkNode* AddURL(int profile,
                            const std::string& title,
                            const GURL& url) {
   return AddURL(profile, GetBookmarkBarNode(profile), 0, title,  url);
 }
 
 const BookmarkNode* AddURL(int profile,
@@ skipping 510 matching lines @@
 
 std::string IndexedSubfolderName(int i) {
   return base::StringPrintf("Subfolder Name %d", i);
 }
 
 std::string IndexedSubsubfolderName(int i) {
   return base::StringPrintf("Subsubfolder Name %d", i);
 }
 
 }  // namespace bookmarks_helper