Change GetProfileToUse method from Profile to content::BrowserContext

chrome/browser/history/history_service_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/history/history_service_factory.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/history/history_service.h"
+#include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/common/pref_names.h"
 
 // static
 HistoryService* HistoryServiceFactory::GetForProfile(
     Profile* profile, Profile::ServiceAccessType sat) {
   // If saving history is disabled, only allow explicit access.
   if (profile->GetPrefs()->GetBoolean(prefs::kSavingBrowserHistoryDisabled) &&
       sat != Profile::EXPLICIT_ACCESS)
     return NULL;
@@ skipping 47 matching lines @@
     content::BrowserContext* context) const {
   Profile* profile = static_cast<Profile*>(context);
   HistoryService* history_service = new HistoryService(profile);
   if (!history_service->Init(profile->GetPath(),
                              BookmarkModelFactory::GetForProfile(profile))) {
     return NULL;
   }
   return history_service;
 }
 
-bool HistoryServiceFactory::ServiceRedirectedInIncognito() const {
-  return true;
+content::BrowserContext* HistoryServiceFactory::GetBrowserContextToUse(
+    content::BrowserContext* context) const {
+  return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
 
 bool HistoryServiceFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }