Use BookmarkModelFactory::GetForBrowserContext everywhere

chrome/browser/ui/webui/browsing_history_handler.cc

 // Copyright 2015 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/ui/webui/browsing_history_handler.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <utility>
@@ skipping 601 matching lines @@
   // through some sort of delegate.
   Browser* browser = chrome::FindBrowserWithWebContents(
       web_ui()->GetWebContents());
   chrome::ShowClearBrowsingDataDialog(browser);
 #endif
 }
 
 void BrowsingHistoryHandler::HandleRemoveBookmark(const base::ListValue* args) {
   base::string16 url = ExtractStringValue(args);
   Profile* profile = Profile::FromWebUI(web_ui());
-  BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile);
+  BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile);
   bookmarks::RemoveAllBookmarks(model, GURL(url));
 }
 
 // static
 void BrowsingHistoryHandler::MergeDuplicateResults(
     std::vector<BrowsingHistoryHandler::HistoryEntry>* results) {
   std::vector<BrowsingHistoryHandler::HistoryEntry> new_results;
   // Pre-reserve the size of the new vector. Since we're working with pointers
   // later on not doing this could lead to the vector being resized and to
   // pointers to invalid locations.
@@ skipping 31 matching lines @@
         entry->entry_type =
             BrowsingHistoryHandler::HistoryEntry::COMBINED_ENTRY;
       }
     }
   }
   results->swap(new_results);
 }
 
 void BrowsingHistoryHandler::ReturnResultsToFrontEnd() {
   Profile* profile = Profile::FromWebUI(web_ui());
-  BookmarkModel* bookmark_model = BookmarkModelFactory::GetForProfile(profile);
+  BookmarkModel* bookmark_model =
+      BookmarkModelFactory::GetForBrowserContext(profile);
   SupervisedUserService* supervised_user_service = NULL;
 #if defined(ENABLE_SUPERVISED_USERS)
   if (profile->IsSupervised())
     supervised_user_service =
         SupervisedUserServiceFactory::GetForProfile(profile);
 #endif
   ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile);
 
   // Combine the local and remote results into |query_results_|, and remove
@@ skipping 267 matching lines @@
 
 void BrowsingHistoryHandler::OnURLsDeleted(
     history::HistoryService* history_service,
     bool all_history,
     bool expired,
     const history::URLRows& deleted_rows,
     const std::set<GURL>& favicon_urls) {
   if (all_history || DeletionsDiffer(deleted_rows, urls_to_be_deleted_))
     web_ui()->CallJavascriptFunctionUnsafe("historyDeleted");
 }