Change GetProfileToUse method from Profile to content::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"
@@ skipping 10 matching lines @@
 }
 
 ProfileKeyedBaseFactory::~ProfileKeyedBaseFactory() {
   dependency_manager_->RemoveComponent(this);
 }
 
 void ProfileKeyedBaseFactory::DependsOn(ProfileKeyedBaseFactory* rhs) {
   dependency_manager_->AddEdge(rhs, this);
 }
 
-content::BrowserContext* ProfileKeyedBaseFactory::GetProfileToUse(
-    content::BrowserContext* context) {
+content::BrowserContext* ProfileKeyedBaseFactory::GetBrowserContextToUse(
+    content::BrowserContext* context) const {
   DCHECK(CalledOnValidThread());
 
   Profile* profile = static_cast<Profile*>(context);
 
 #ifndef NDEBUG
   dependency_manager_->AssertProfileWasntDestroyed(profile);
 #endif
 
-  // Possibly handle Incognito mode.
-  if (profile->IsOffTheRecord()) {
-    if (ServiceRedirectedInIncognito()) {
-      profile = profile->GetOriginalProfile();
-
-#ifndef NDEBUG
-      dependency_manager_->AssertProfileWasntDestroyed(profile);
-#endif
-    } else if (ServiceHasOwnInstanceInIncognito()) {
-      // No-op; the pointers are already set correctly.
-    } else {
-      return NULL;
-    }
-  }
+  // Safe default for the Incognito mode: no service.
+  if (profile->IsOffTheRecord())
+    return NULL;
 
   return 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.
   //
@@ skipping 20 matching lines @@
       registered_preferences_.find(profile);
   if (it == registered_preferences_.end()) {
     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(
     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(
     content::BrowserContext* profile) const {
   return registered_preferences_.find(profile) !=
       registered_preferences_.end();
 }
 
 void ProfileKeyedBaseFactory::MarkPreferencesSetOn(
     content::BrowserContext* profile) {
   DCHECK(!ArePreferencesSetOn(profile));
   registered_preferences_.insert(profile);
 }