Change ProfileKeyedAPIFactory to build instances with BrowserContext instead of Profile.

chrome/browser/extensions/api/cookies/cookies_api.cc

Index: chrome/browser/extensions/api/cookies/cookies_api.cc
diff --git a/chrome/browser/extensions/api/cookies/cookies_api.cc b/chrome/browser/extensions/api/cookies/cookies_api.cc
index 6df1a70ae9d76132efd428836de16ecd128321a3..4eb83b4e44121e2f1ab7868b1b5e9b309460ecd8 100644
--- a/chrome/browser/extensions/api/cookies/cookies_api.cc
+++ b/chrome/browser/extensions/api/cookies/cookies_api.cc
@@ -560,9 +560,9 @@ void CookiesGetAllCookieStoresFunction::Run() {
   SendResponse(RunImpl());
 }
 
-CookiesAPI::CookiesAPI(Profile* profile)
-    : profile_(profile) {
-  ExtensionSystem::Get(profile_)->event_router()->RegisterObserver(
+CookiesAPI::CookiesAPI(content::BrowserContext* context)
+    : browser_context_(context) {
+  ExtensionSystem::Get(browser_context_)->event_router()->RegisterObserver(
       this, cookies::OnChanged::kEventName);
 }
 
@@ -570,7 +570,8 @@ CookiesAPI::~CookiesAPI() {
 }
 
 void CookiesAPI::Shutdown() {
-  ExtensionSystem::Get(profile_)->event_router()->UnregisterObserver(this);
+  ExtensionSystem::Get(browser_context_)->event_router()->UnregisterObserver(
+      this);
 }
 
 static base::LazyInstance<ProfileKeyedAPIFactory<CookiesAPI> >
@@ -583,8 +584,9 @@ ProfileKeyedAPIFactory<CookiesAPI>* CookiesAPI::GetFactoryInstance() {
 
 void CookiesAPI::OnListenerAdded(
     const extensions::EventListenerInfo& details) {
-  cookies_event_router_.reset(new CookiesEventRouter(profile_));
-  ExtensionSystem::Get(profile_)->event_router()->UnregisterObserver(this);
+  cookies_event_router_.reset(new CookiesEventRouter(browser_context_));
+  ExtensionSystem::Get(browser_context_)->event_router()->UnregisterObserver(
+      this);
 }
 
 }  // namespace extensions