Move ProfileKeyedAPI implementations to take BrowserContext in the constructor (part 1).

These are a mix of everywhere changing Profile to BrowserContext and simply putting Profile::FromBrowserContext in the constructor (not changing the service's use of Profile*).

BUG=309909

Review URL: https://codereview.chromium.org/171813010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252496 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 28 insertions, 23 deletions

diff --git a/chrome/browser/chromeos/extensions/media_player_api.cc b/chrome/browser/chromeos/extensions/media_player_api.cc
index d18f07b..0651a60 100644
--- a/chrome/browser/chromeos/extensions/media_player_api.cc
+++ b/chrome/browser/chromeos/extensions/media_player_api.cc
@@ -10,20 +10,21 @@
 
 namespace extensions {
 
-MediaPlayerAPI::MediaPlayerAPI(Profile* profile) : profile_(profile) {
-}
+MediaPlayerAPI::MediaPlayerAPI(content::BrowserContext* context)
+    : browser_context_(context) {}
 
 MediaPlayerAPI::~MediaPlayerAPI() {
 }
 
 // static
-MediaPlayerAPI* MediaPlayerAPI::Get(Profile* profile) {
-  return ProfileKeyedAPIFactory<MediaPlayerAPI>::GetForProfile(profile);
+MediaPlayerAPI* MediaPlayerAPI::Get(content::BrowserContext* context) {
+  return ProfileKeyedAPIFactory<MediaPlayerAPI>::GetForProfile(context);
 }
 
 MediaPlayerEventRouter* MediaPlayerAPI::media_player_event_router() {
   if (!media_player_event_router_)
-    media_player_event_router_.reset(new MediaPlayerEventRouter(profile_));
+    media_player_event_router_.reset(
+        new MediaPlayerEventRouter(browser_context_));
   return media_player_event_router_.get();
 }
 
diff --git a/chrome/browser/chromeos/extensions/media_player_api.h b/chrome/browser/chromeos/extensions/media_player_api.h
index 026ae87..3b8da75 100644
--- a/chrome/browser/chromeos/extensions/media_player_api.h
+++ b/chrome/browser/chromeos/extensions/media_player_api.h
@@ -13,18 +13,20 @@
 #include "chrome/browser/extensions/api/profile_keyed_api_factory.h"
 #include "extensions/browser/extension_function.h"
 
-class Profile;
+namespace content {
+class BrowserContext;
+}
 
 namespace extensions {
 class MediaPlayerEventRouter;
 
 class MediaPlayerAPI : public ProfileKeyedAPI {
  public:
-  explicit MediaPlayerAPI(Profile* profile);
+  explicit MediaPlayerAPI(content::BrowserContext* context);
   virtual ~MediaPlayerAPI();
 
   // Convenience method to get the MediaPlayerAPI for a profile.
-  static MediaPlayerAPI* Get(Profile* profile);
+  static MediaPlayerAPI* Get(content::BrowserContext* context);
 
   MediaPlayerEventRouter* media_player_event_router();
 
@@ -34,7 +36,7 @@ class MediaPlayerAPI : public ProfileKeyedAPI {
  private:
   friend class ProfileKeyedAPIFactory<MediaPlayerAPI>;
 
-  Profile* const profile_;
+  content::BrowserContext* const browser_context_;
 
   // ProfileKeyedAPI implementation.
   static const char* service_name() {
diff --git a/chrome/browser/chromeos/extensions/media_player_event_router.cc b/chrome/browser/chromeos/extensions/media_player_event_router.cc
index c5b622f..fab7361 100644
--- a/chrome/browser/chromeos/extensions/media_player_event_router.cc
+++ b/chrome/browser/chromeos/extensions/media_player_event_router.cc
@@ -5,39 +5,39 @@
 #include "chrome/browser/chromeos/extensions/media_player_event_router.h"
 
 #include "base/memory/singleton.h"
-#include "chrome/browser/profiles/profile.h"
+#include "content/public/browser/browser_context.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_system.h"
 
 namespace extensions {
 
-static void BroadcastEvent(Profile* profile, const std::string& event_name) {
-  if (profile && extensions::ExtensionSystem::Get(profile)->event_router()) {
+static void BroadcastEvent(content::BrowserContext* context,
+                           const std::string& event_name) {
+  if (context && extensions::ExtensionSystem::Get(context)->event_router()) {
     scoped_ptr<base::ListValue> args(new base::ListValue());
     scoped_ptr<extensions::Event> event(new extensions::Event(
         event_name, args.Pass()));
-    extensions::ExtensionSystem::Get(profile)->event_router()->
-        BroadcastEvent(event.Pass());
+    extensions::ExtensionSystem::Get(context)->event_router()->BroadcastEvent(
+        event.Pass());
   }
 }
 
-MediaPlayerEventRouter::MediaPlayerEventRouter(Profile* profile)
-    : profile_(profile) {
-}
+MediaPlayerEventRouter::MediaPlayerEventRouter(content::BrowserContext* context)
+    : browser_context_(context) {}
 
 MediaPlayerEventRouter::~MediaPlayerEventRouter() {
 }
 
 void MediaPlayerEventRouter::NotifyNextTrack() {
-  BroadcastEvent(profile_, "mediaPlayerPrivate.onNextTrack");
+  BroadcastEvent(browser_context_, "mediaPlayerPrivate.onNextTrack");
 }
 
 void MediaPlayerEventRouter::NotifyPrevTrack() {
-  BroadcastEvent(profile_, "mediaPlayerPrivate.onPrevTrack");
+  BroadcastEvent(browser_context_, "mediaPlayerPrivate.onPrevTrack");
 }
 
 void MediaPlayerEventRouter::NotifyTogglePlayState() {
-  BroadcastEvent(profile_, "mediaPlayerPrivate.onTogglePlayState");
+  BroadcastEvent(browser_context_, "mediaPlayerPrivate.onTogglePlayState");
 }
 
 }  // namespace extensions
diff --git a/chrome/browser/chromeos/extensions/media_player_event_router.h b/chrome/browser/chromeos/extensions/media_player_event_router.h
index d872405..bbba962 100644
--- a/chrome/browser/chromeos/extensions/media_player_event_router.h
+++ b/chrome/browser/chromeos/extensions/media_player_event_router.h
@@ -7,14 +7,16 @@
 
 #include "base/basictypes.h"
 
-class Profile;
+namespace content {
+class BrowserContext;
+}
 
 namespace extensions {
 
 // Event router class for events related to Mediaplayer.
 class MediaPlayerEventRouter {
  public:
-  explicit MediaPlayerEventRouter(Profile* profile);
+  explicit MediaPlayerEventRouter(content::BrowserContext* context);
   virtual ~MediaPlayerEventRouter();
 
   // Send notification that next-track shortcut key was pressed.
@@ -27,7 +29,7 @@ class MediaPlayerEventRouter {
   void NotifyTogglePlayState();
 
  private:
-  Profile* profile_;
+  content::BrowserContext* browser_context_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaPlayerEventRouter);
 };