media: Simplify MediaPermissionDispatcher.

content/renderer/render_frame_impl.h

Index: content/renderer/render_frame_impl.h
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index f9cf06cd0d6133ef58aae34fc379b7ce31af3239..8d21761ced548470461879bc5dc3a1cafc45e2a1 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -119,7 +119,7 @@ class GeolocationDispatcher;
 class ManifestManager;
 class MediaStreamDispatcher;
 class MediaStreamRendererFactory;
-class MediaPermissionDispatcherImpl;
+class MediaPermissionDispatcher;
 class MidiDispatcher;
 class NavigationState;
 class NotificationPermissionDispatcher;
@@ -645,11 +645,7 @@ class CONTENT_EXPORT RenderFrameImpl
   void SetPendingNavigationParams(
       scoped_ptr<NavigationParams> navigation_params);
 
-  // Expose MediaPermission to the non-UI threads. Any calls to this will be
-  // redirected to |media_permission_dispatcher_| on UI thread and have the
-  // callback called on |caller_task_runner|.
-  scoped_ptr<media::MediaPermission> CreateMediaPermissionProxy(
-      scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner);
+  media::MediaPermission* GetMediaPermission();
 
   // Sends the current frame's navigation state to the browser.
   void SendUpdateState();
@@ -942,8 +938,6 @@ class CONTENT_EXPORT RenderFrameImpl
 
   bool AreSecureCodecsSupported();
 
-  media::MediaPermission* GetMediaPermission();
-
 #if defined(ENABLE_MOJO_MEDIA)
   media::interfaces::ServiceFactory* GetMediaServiceFactory();
 
@@ -1096,7 +1090,7 @@ class CONTENT_EXPORT RenderFrameImpl
   scoped_ptr<media::WebEncryptedMediaClientImpl> web_encrypted_media_client_;
 
   // The media permission dispatcher attached to this frame, lazily initialized.
-  MediaPermissionDispatcherImpl* media_permission_dispatcher_;
+  MediaPermissionDispatcher* media_permission_dispatcher_;

[Sergey Ulanov, 2016/02/02 22:11:02]

Should this be a scoped_ptr<>? As far as I can tell it's leaked when RenderFrame
is destroyed.

[xhwang, 2016/02/03 00:17:20]

(reposting a previous reply with edits)

MediaPermissionDispatcher is a RenderFrameObserver, which will be released when
the frame is destroyed [1]. We have many similar members in RenderFrameImpl,
e.g.
MidiDispatcher.

I agree that this is a bit confusing. It's this way for historical reasons. 

Actually in a later CL [2] I'll update MediaPermissionDispatcher so that it will
NOT be a
RenderFrameObserver, and RenderFrameImpl will just hold a scoped_ptr of
MediaPermissionDispatcher.

[1]
https://code.google.com/p/chromium/codesearch#chromium/src/content/public/ren...

[2] https://chromiumcodereview.appspot.com/1470233002/

[Sergey Ulanov, 2016/02/04 20:50:23]

I see. Add a comment here? similar to web_user_media_client_

[xhwang, 2016/02/04 22:35:18]

Done.

 
 #if defined(ENABLE_MOJO_MEDIA)
   // The media factory attached to this frame, lazily initialized.