[components] Switch {RefCounted}ProfileKeyedService to use BrowserContext

chrome/browser/profiles/profile_keyed_base_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/profiles/profile_keyed_base_factory.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "components/user_prefs/pref_registry_syncable.h"
+#include "components/user_prefs/user_prefs.h"
 
 ProfileKeyedBaseFactory::ProfileKeyedBaseFactory(
     const char* name, ProfileDependencyManager* manager)
     : dependency_manager_(manager)
 #ifndef NDEBUG
     , service_name_(name)
 #endif
 {
   dependency_manager_->AddComponent(this);
 }
 
 ProfileKeyedBaseFactory::~ProfileKeyedBaseFactory() {
   dependency_manager_->RemoveComponent(this);
 }
 
 void ProfileKeyedBaseFactory::DependsOn(ProfileKeyedBaseFactory* rhs) {
   dependency_manager_->AddEdge(rhs, this);
 }
 
 Profile* ProfileKeyedBaseFactory::GetProfileToUse(Profile* profile) {
   DCHECK(CalledOnValidThread());
 
 #ifndef NDEBUG
   dependency_manager_->AssertProfileWasntDestroyed(profile);
 #endif
 
   // Possibly handle Incognito mode.
   if (profile->IsOffTheRecord()) {
     if (ServiceRedirectedInIncognito()) {
       profile = profile->GetOriginalProfile();

[Paweł Hajdan Jr., 2013/04/18 18:33:00]

There is no GetOriginalProfile or equivalent in BrowserContext, and I'm not
quite sure what to do about this.

John Abd-El-Malek generally objected to adding GetOriginalProfile concept to
content.

I've commented out usages of GetProfileToUse in this CL just to get it to
compile, but this will need a solution before I land this.

[Jói, 2013/04/19 10:39:26]

Perhaps the ProfileDependencyManager should receive a delegate as an
initialization parameter; that delegate could implement GetContextToUse for a
given BrowserContext*.

Alternatively, perhaps it is worth looking into having a BrowserContext-based
PKSF that knows nothing about incognito (and thus always response with the same
pointer when GetContextToUse is called) and a specialization within Chrome that
is keyed off of Profile that can implement it in terms of a Profile object.  I'm
not sure this is better though, and it might be a bunch of work to figure out
when it's applicable, although I guess that you only need to know about
incognito if ServiceRedirectedInIncognito returns true?

 
 #ifndef NDEBUG
       dependency_manager_->AssertProfileWasntDestroyed(profile);
 #endif
     } else if (ServiceHasOwnInstanceInIncognito()) {
       // No-op; the pointers are already set correctly.
     } else {
       return NULL;
     }
   }
 
   return profile;
 }
 
-void ProfileKeyedBaseFactory::RegisterUserPrefsOnProfile(Profile* profile) {
+void ProfileKeyedBaseFactory::RegisterUserPrefsOnProfile(content::BrowserContext* profile) {
   // Safe timing for pref registration is hard. Previously, we made Profile
   // responsible for all pref registration on every service that used
   // Profile. Now we don't and there are timing issues.
   //
   // With normal profiles, prefs can simply be registered at
   // ProfileDependencyManager::CreateProfileServices time. With incognito
   // profiles, we just never register since incognito profiles share the same
   // pref services with their parent profiles.
   //
   // TestingProfiles throw a wrench into the mix, in that some tests will
   // swap out the PrefService after we've registered user prefs on the original
   // PrefService. Test code that does this is responsible for either manually
   // invoking RegisterUserPrefs() on the appropriate ProfileKeyedServiceFactory
   // associated with the prefs they need, or they can use SetTestingFactory()
   // and create a service (since service creation with a factory method causes
   // registration to happen at service creation time).
   //
   // Now that services are responsible for declaring their preferences, we have
   // to enforce a uniquenes check here because some tests create one profile and
   // multiple services of the same type attached to that profile (serially, not
   // parallel) and we don't want to register multiple times on the same profile.
   DCHECK(!profile->IsOffTheRecord());
 
-  std::set<Profile*>::iterator it = registered_preferences_.find(profile);
+  std::set<content::BrowserContext*>::iterator it = registered_preferences_.find(profile);
   if (it == registered_preferences_.end()) {
-    PrefService* prefs = profile->GetPrefs();
+    PrefService* prefs = components::UserPrefs::Get(profile);
     PrefRegistrySyncable* registry = static_cast<PrefRegistrySyncable*>(
         prefs->DeprecatedGetPrefRegistry());
     RegisterUserPrefs(registry);
     registered_preferences_.insert(profile);
   }
 }
 
 bool ProfileKeyedBaseFactory::ServiceRedirectedInIncognito() const {
   return false;
 }
 
 bool ProfileKeyedBaseFactory::ServiceHasOwnInstanceInIncognito() const {
   return false;
 }
 
 bool ProfileKeyedBaseFactory::ServiceIsCreatedWithProfile() const {
   return false;
 }
 
 bool ProfileKeyedBaseFactory::ServiceIsNULLWhileTesting() const {
   return false;
 }
 
-void ProfileKeyedBaseFactory::ProfileDestroyed(Profile* profile) {
+void ProfileKeyedBaseFactory::ProfileDestroyed(content::BrowserContext* profile) {
   // While object destruction can be customized in ways where the object is
   // only dereferenced, this still must run on the UI thread.
   DCHECK(CalledOnValidThread());
 
   registered_preferences_.erase(profile);
 }
 
-bool ProfileKeyedBaseFactory::ArePreferencesSetOn(Profile* profile) const {
+bool ProfileKeyedBaseFactory::ArePreferencesSetOn(content::BrowserContext* profile) const {
   return registered_preferences_.find(profile) !=
       registered_preferences_.end();
 }
 
-void ProfileKeyedBaseFactory::MarkPreferencesSetOn(Profile* profile) {
+void ProfileKeyedBaseFactory::MarkPreferencesSetOn(content::BrowserContext* profile) {
   DCHECK(!ArePreferencesSetOn(profile));
   registered_preferences_.insert(profile);
 }