Change GetProfileToUse method from Profile to content::BrowserContext

chrome/browser/profiles/profile_keyed_base_factory.cc

Index: chrome/browser/profiles/profile_keyed_base_factory.cc
diff --git a/chrome/browser/profiles/profile_keyed_base_factory.cc b/chrome/browser/profiles/profile_keyed_base_factory.cc
index daa24e2735affa1a3b0b7056bc143b20a02b939b..0d57bf6b4de20b0f2611a2a41b24a503e926aaaf 100644
--- a/chrome/browser/profiles/profile_keyed_base_factory.cc
+++ b/chrome/browser/profiles/profile_keyed_base_factory.cc
@@ -28,8 +28,8 @@ 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);
@@ -38,20 +38,9 @@ content::BrowserContext* ProfileKeyedBaseFactory::GetProfileToUse(
   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;
 }
@@ -92,14 +81,6 @@ void ProfileKeyedBaseFactory::RegisterUserPrefsOnProfile(
   }
 }
 
-bool ProfileKeyedBaseFactory::ServiceRedirectedInIncognito() const {
-  return false;
-}
-
-bool ProfileKeyedBaseFactory::ServiceHasOwnInstanceInIncognito() const {
-  return false;
-}
-
 bool ProfileKeyedBaseFactory::ServiceIsCreatedWithProfile() const {
   return false;
 }