Refactor dependency on Profile to BrowserContext in spell check.

chrome/browser/spellchecker/spellcheck_factory.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/spellchecker/spellcheck_factory.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/spellchecker/spellcheck_service.h"
 #include "chrome/common/pref_names.h"
 #include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
 #include "components/user_prefs/pref_registry_syncable.h"
+#include "components/user_prefs/user_prefs.h"
 #include "content/public/browser/render_process_host.h"
 #include "grit/locale_settings.h"
 
 // static
-SpellcheckService* SpellcheckServiceFactory::GetForProfile(Profile* profile) {
+SpellcheckService* SpellcheckServiceFactory::GetForContext(
+    content::BrowserContext* context) {
   return static_cast<SpellcheckService*>(
-      GetInstance()->GetServiceForBrowserContext(profile, true));
+      GetInstance()->GetServiceForBrowserContext(context, true));
 }
 
 // static
 SpellcheckService* SpellcheckServiceFactory::GetForRenderProcessId(
     int render_process_id) {
   content::RenderProcessHost* host =
       content::RenderProcessHost::FromID(render_process_id);
   if (!host)
     return NULL;
-  Profile* profile = Profile::FromBrowserContext(host->GetBrowserContext());
-  if (!profile)
+  content::BrowserContext* context = host->GetBrowserContext();
+  if (!context)
     return NULL;
-  return GetForProfile(profile);
-}
-
-// static
-SpellcheckService* SpellcheckServiceFactory::GetForProfileWithoutCreating(
-    Profile* profile) {
-  return static_cast<SpellcheckService*>(
-      GetInstance()->GetServiceForBrowserContext(profile, false));
+  return GetForContext(context);
 }
 
 // static
 SpellcheckServiceFactory* SpellcheckServiceFactory::GetInstance() {
   return Singleton<SpellcheckServiceFactory>::get();
 }
 
 SpellcheckServiceFactory::SpellcheckServiceFactory()
     : BrowserContextKeyedServiceFactory(
         "SpellcheckService",
         BrowserContextDependencyManager::GetInstance()) {
   // TODO(erg): Uncomment these as they are initialized.
   // DependsOn(RequestContextFactory::GetInstance());
 }
 
 SpellcheckServiceFactory::~SpellcheckServiceFactory() {}
 
 BrowserContextKeyedService* SpellcheckServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
-  Profile* profile = static_cast<Profile*>(context);
+  // Many variables are initialized from the |context| in the SpellcheckService.
+  SpellcheckService* spellcheck = new SpellcheckService(context);
 
-  // Many variables are initialized from the profile in the SpellcheckService.
-  DCHECK(profile);
-  SpellcheckService* spellcheck = new SpellcheckService(profile);
+  PrefService* prefs = user_prefs::UserPrefs::Get(context);
+  DCHECK(prefs);
 
   // Instantiates Metrics object for spellchecking for use.
   spellcheck->StartRecordingMetrics(
-      profile->GetPrefs()->GetBoolean(prefs::kEnableContinuousSpellcheck));
+      prefs->GetBoolean(prefs::kEnableContinuousSpellcheck));
 
   return spellcheck;
 }
 
 void SpellcheckServiceFactory::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* user_prefs) {
   // TODO(estade): IDS_SPELLCHECK_DICTIONARY should be an ASCII string.
   user_prefs->RegisterLocalizedStringPref(
       prefs::kSpellCheckDictionary,
       IDS_SPELLCHECK_DICTIONARY,
@@ skipping 17 matching lines @@
 }
 
 content::BrowserContext* SpellcheckServiceFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
 
 bool SpellcheckServiceFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }