Use BookmarkModelFactory::GetForBrowserContext everywhere

chrome/browser/importer/external_process_importer_host.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/importer/external_process_importer_host.h"
 
 #include "base/bind.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/importer/external_process_importer_client.h"
 #include "chrome/browser/importer/firefox_profile_lock.h"
 #include "chrome/browser/importer/importer_lock_dialog.h"
 #include "chrome/browser/importer/importer_progress_observer.h"
 #include "chrome/browser/importer/in_process_importer_bridge.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/search_engines/template_url_service.h"
 #include "content/public/browser/browser_thread.h"
 
 using bookmarks::BookmarkModel;
 using content::BrowserThread;
 
 ExternalProcessImporterHost::ExternalProcessImporterHost()
     : headless_(false),
@@ skipping 62 matching lines @@
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   firefox_lock_.reset();
   if (observer_)
     observer_->ImportEnded();
   delete this;
 }
 
 ExternalProcessImporterHost::~ExternalProcessImporterHost() {
   if (installed_bookmark_observer_) {
     DCHECK(profile_);
-    BookmarkModelFactory::GetForProfile(profile_)->RemoveObserver(this);
+    BookmarkModelFactory::GetForBrowserContext(profile_)->RemoveObserver(this);
   }
 }
 
 void ExternalProcessImporterHost::LaunchImportIfReady() {
   if (waiting_for_bookmarkbar_model_ || template_service_subscription_.get() ||
       !is_source_readable_ || cancelled_)
     return;
 
   // This is the in-process half of the bridge, which catches data from the IPC
   // pipe and feeds it to the ProfileWriter. The external process half of the
@@ skipping 77 matching lines @@
   return true;
 }
 
 void ExternalProcessImporterHost::CheckForLoadedModels(uint16_t items) {
   // A target profile must be loaded by StartImportSettings().
   DCHECK(profile_);
 
   // BookmarkModel should be loaded before adding IE favorites. So we observe
   // the BookmarkModel if needed, and start the task after it has been loaded.
   if ((items & importer::FAVORITES) && !writer_->BookmarkModelIsLoaded()) {
-    BookmarkModelFactory::GetForProfile(profile_)->AddObserver(this);
+    BookmarkModelFactory::GetForBrowserContext(profile_)->AddObserver(this);
     waiting_for_bookmarkbar_model_ = true;
     installed_bookmark_observer_ = true;
   }
 
   // Observes the TemplateURLService if needed to import search engines from the
   // other browser. We also check to see if we're importing bookmarks because
   // we can import bookmark keywords from Firefox as search engines.
   if ((items & importer::SEARCH_ENGINES) || (items & importer::FAVORITES)) {
     if (!writer_->TemplateURLServiceIsLoaded()) {
       TemplateURLService* model =
           TemplateURLServiceFactory::GetForProfile(profile_);
       template_service_subscription_ = model->RegisterOnLoadedCallback(
           base::Bind(&ExternalProcessImporterHost::OnTemplateURLServiceLoaded,
                      weak_ptr_factory_.GetWeakPtr()));
       model->Load();
     }
   }
 }