media: Simplify MediaPermissionDispatcher.

content/renderer/render_frame_impl.h

 // 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.
 
 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 101 matching lines @@
 
 class ChildFrameCompositingHelper;
 class CompositorDependencies;
 class DevToolsAgent;
 class DocumentState;
 class ExternalPopupMenu;
 class GeolocationDispatcher;
 class ManifestManager;
 class MediaStreamDispatcher;
 class MediaStreamRendererFactory;
-class MediaPermissionDispatcherImpl;
+class MediaPermissionDispatcher;
 class MidiDispatcher;
 class NavigationState;
 class NotificationPermissionDispatcher;
 class PageState;
 class PepperPluginInstanceImpl;
 class PermissionDispatcher;
 class PresentationDispatcher;
 class PushMessagingDispatcher;
 class RendererAccessibility;
 class RendererCdmManager;
@@ skipping 505 matching lines @@
       mojo::InterfaceRequest<mojo::ServiceProvider> services,
       mojo::ServiceProviderPtr exposed_services);
 
   ManifestManager* manifest_manager();
 
   // TODO(creis): Remove when the only caller, the HistoryController, is no
   // more.
   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();
 
   // Creates a MojoBindingsController to allow WebUI documents to communicate
   // with the browser process. If |for_layout_tests| is true, the module system
   // is exposed on a global "mojo" object rather than "define".
   void EnableMojoBindings(bool for_layout_tests);
 
  protected:
@@ skipping 272 matching lines @@
       blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
       const media::WebMediaPlayerParams& params);
 
   RendererMediaPlayerManager* GetMediaPlayerManager();
 
   RendererMediaSessionManager* GetMediaSessionManager();
 #endif
 
   bool AreSecureCodecsSupported();
 
-  media::MediaPermission* GetMediaPermission();
-
 #if defined(ENABLE_MOJO_MEDIA)
   media::interfaces::ServiceFactory* GetMediaServiceFactory();
 
   // Called when a connection error happened on |media_service_factory_|.
   void OnMediaServiceFactoryConnectionError();
 #endif
 
   media::CdmFactory* GetCdmFactory();
 
   void RegisterMojoServices();
@@ skipping 132 matching lines @@
   // Dispatches permission requests for Web Notifications.
   NotificationPermissionDispatcher* notification_permission_dispatcher_;
 
   // Destroyed via the RenderFrameObserver::OnDestruct() mechanism.
   UserMediaClientImpl* web_user_media_client_;
 
   // EncryptedMediaClient attached to this frame; lazily initialized.
   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.
   media::interfaces::ServiceFactoryPtr media_service_factory_;
 #endif
 
   // MidiClient attached to this frame; lazily initialized.
   MidiDispatcher* midi_dispatcher_;
 
 #if defined(OS_ANDROID)
@@ skipping 89 matching lines @@
 #endif
 
   base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_