media: Simplify MediaPermissionDispatcher.

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 6da306b715f16406da738339f66c677f4c5b792c..649115de2d9660b5433926298346604700c3a4ad 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -96,8 +96,7 @@
 #include "content/renderer/media/audio_device_factory.h"
 #include "content/renderer/media/audio_renderer_mixer_manager.h"
 #include "content/renderer/media/cdm/render_cdm_factory.h"
-#include "content/renderer/media/media_permission_dispatcher_impl.h"
-#include "content/renderer/media/media_permission_dispatcher_proxy.h"
+#include "content/renderer/media/media_permission_dispatcher.h"
 #include "content/renderer/media/media_stream_dispatcher.h"
 #include "content/renderer/media/media_stream_renderer_factory_impl.h"
 #include "content/renderer/media/midi_dispatcher.h"
@@ -5948,16 +5947,9 @@ RendererMediaSessionManager* RenderFrameImpl::GetMediaSessionManager() {
 
 #endif  // defined(OS_ANDROID)
 
-scoped_ptr<media::MediaPermission> RenderFrameImpl::CreateMediaPermissionProxy(
-    scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner) {
-  MediaPermissionDispatcherImpl* media_permission =
-      static_cast<MediaPermissionDispatcherImpl*>(GetMediaPermission());
-  return media_permission->CreateProxy(caller_task_runner);
-}
-
 media::MediaPermission* RenderFrameImpl::GetMediaPermission() {
   if (!media_permission_dispatcher_)
-    media_permission_dispatcher_ = new MediaPermissionDispatcherImpl(this);
+    media_permission_dispatcher_ = new MediaPermissionDispatcher(this);

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

This is not thread-safe. What thread is it supposed to be called on?

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

RenderFrameImpl lives exclusively on the main thread. So all RenderFrameImpl
methods should only be called on the main thread, which I *think* is the case
for PeerConnectionDependencyFactory::CreatePeerConnection(). Otherwise even the
call to RenderFrameImpl::FromWebFrame() may not be safe.

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

Add a DCHECK?

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

In RenderFrameImpl we don't have this kind of DCHECK anywhere. It's the callers
responsibility to make sure RenderFrameImpl methods are called on the correct
thread. Maybe we can add a DCHECK in PeerConnectionDependencyFactory code?

   return media_permission_dispatcher_;
 }