Change ProfileKeyedAPIFactory to build instances with BrowserContext instead of Profile.

chrome/browser/chromeos/extensions/screenlock_private_api.cc

 // Copyright 2013 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/chromeos/extensions/screenlock_private_api.h"
 
 #include "base/lazy_instance.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/extensions/image_loader.h"
 #include "chrome/common/extensions/api/screenlock_private.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_system.h"
+#include "ui/gfx/image/image.h"
 
 namespace screenlock = extensions::api::screenlock_private;
 
 namespace extensions {
 
 ScreenlockPrivateGetLockedFunction::ScreenlockPrivateGetLockedFunction() {}
 
 ScreenlockPrivateGetLockedFunction::~ScreenlockPrivateGetLockedFunction() {}
 
 bool ScreenlockPrivateGetLockedFunction::RunImpl() {
@@ skipping 78 matching lines @@
   ScreenlockPrivateEventRouter* router =
     ScreenlockPrivateEventRouter::GetFactoryInstance()->GetForProfile(
         GetProfile());
   locker->ShowUserPodButton(
       GetProfile()->GetProfileName(), image,
       base::Bind(&ScreenlockPrivateEventRouter::OnButtonClicked,
                  base::Unretained(router)));
   SendResponse(error_.empty());
 }
 
-ScreenlockPrivateEventRouter::ScreenlockPrivateEventRouter(Profile* profile)
-    : profile_(profile) {
+ScreenlockPrivateEventRouter::ScreenlockPrivateEventRouter(
+    content::BrowserContext* context)
+    : browser_context_(context) {
   chromeos::SessionManagerClient* session_manager =
       chromeos::DBusThreadManager::Get()->GetSessionManagerClient();
   if (!session_manager->HasObserver(this))
     session_manager->AddObserver(this);
 }
 
 ScreenlockPrivateEventRouter::~ScreenlockPrivateEventRouter() {}
 
 void ScreenlockPrivateEventRouter::ScreenIsLocked() {
   DispatchEvent(screenlock::OnChanged::kEventName,
       new base::FundamentalValue(true));
 }
 
 void ScreenlockPrivateEventRouter::ScreenIsUnlocked() {
   DispatchEvent(screenlock::OnChanged::kEventName,
       new base::FundamentalValue(false));
 }
 
 void ScreenlockPrivateEventRouter::DispatchEvent(
     const std::string& event_name,
     base::Value* arg) {
   scoped_ptr<base::ListValue> args(new base::ListValue());
   if (arg)
     args->Append(arg);
   scoped_ptr<extensions::Event> event(new extensions::Event(
       event_name, args.Pass()));
-  extensions::ExtensionSystem::Get(profile_)->event_router()->
-      BroadcastEvent(event.Pass());
+  extensions::ExtensionSystem::Get(browser_context_)
+      ->event_router()
+      ->BroadcastEvent(event.Pass());
 }
 
 static base::LazyInstance<extensions::ProfileKeyedAPIFactory<
     ScreenlockPrivateEventRouter> >
     g_factory = LAZY_INSTANCE_INITIALIZER;
 
 // static
 extensions::ProfileKeyedAPIFactory<ScreenlockPrivateEventRouter>*
 ScreenlockPrivateEventRouter::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 void ScreenlockPrivateEventRouter::Shutdown() {
   chromeos::SessionManagerClient* session_manager =
       chromeos::DBusThreadManager::Get()->GetSessionManagerClient();
   if (session_manager->HasObserver(this))
     session_manager->RemoveObserver(this);
 }
 
 void ScreenlockPrivateEventRouter::OnButtonClicked() {
   DispatchEvent(screenlock::OnButtonClicked::kEventName, NULL);
 }
 
 }  // namespace extensions