media: Add MediaPermission interface and MediaPermissionDispatcher.

content/renderer/render_frame_impl.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 "content/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 
 #include "base/auto_reset.h"
@@ skipping 54 matching lines @@
 #include "content/renderer/external_popup_menu.h"
 #include "content/renderer/geolocation_dispatcher.h"
 #include "content/renderer/history_controller.h"
 #include "content/renderer/history_serialization.h"
 #include "content/renderer/image_loading_helper.h"
 #include "content/renderer/ime_event_guard.h"
 #include "content/renderer/internal_document_state_data.h"
 #include "content/renderer/manifest/manifest_manager.h"
 #include "content/renderer/media/audio_renderer_mixer_manager.h"
 #include "content/renderer/media/crypto/render_cdm_factory.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.h"
 #include "content/renderer/media/midi_dispatcher.h"
 #include "content/renderer/media/render_media_log.h"
 #include "content/renderer/media/user_media_client_impl.h"
 #include "content/renderer/media/webmediaplayer_ms.h"
 #include "content/renderer/mojo/service_registry_js_wrapper.h"
 #include "content/renderer/notification_permission_dispatcher.h"
 #include "content/renderer/npapi/plugin_channel_host.h"
 #include "content/renderer/pepper/plugin_instance_throttler_impl.h"
@@ skipping 583 matching lines @@
       proxy_routing_id_(MSG_ROUTING_NONE),
 #if defined(ENABLE_PLUGINS)
       plugin_power_saver_helper_(NULL),
 #endif
       cookie_jar_(this),
       selection_text_offset_(0),
       selection_range_(gfx::Range::InvalidRange()),
       handling_select_range_(false),
       notification_permission_dispatcher_(NULL),
       web_user_media_client_(NULL),
+      media_permission_dispatcher_(NULL),
       midi_dispatcher_(NULL),
 #if defined(OS_ANDROID)
       media_player_manager_(NULL),
 #endif
 #if defined(ENABLE_BROWSER_CDMS)
       cdm_manager_(NULL),
 #endif
 #if defined(VIDEO_HOLE)
       contains_media_player_(false),
 #endif
@@ skipping 2694 matching lines @@
   if (!web_encrypted_media_client_) {
 #if defined(ENABLE_PEPPER_CDMS)
     scoped_ptr<media::CdmFactory> cdm_factory(
         new RenderCdmFactory(base::Bind(PepperCdmWrapperImpl::Create, frame_)));
 #elif defined(ENABLE_BROWSER_CDMS)
     scoped_ptr<media::CdmFactory> cdm_factory(
         new RenderCdmFactory(GetCdmManager()));
 #else
     scoped_ptr<media::CdmFactory> cdm_factory(new RenderCdmFactory());
 #endif
-    web_encrypted_media_client_.reset(
-        new media::WebEncryptedMediaClientImpl(cdm_factory.Pass()));
+
+    DCHECK(!media_permission_dispatcher_);

[ddorwin, 2015/01/26 23:33:46]

Other than this DCHECK, do we need to save the pointer in this class? The
web_encrypted_media_client_ check on 3384 should be sufficient, right?

[xhwang, 2015/01/27 00:01:58]

Since |media_permission_dispatcher_| is a RenderFrameObserver, I feel it's
clearer to have RenderFrameImpl to own it. Otherwise the ownership (e.g. who
deletes it) will be harder to track.

+    media_permission_dispatcher_ = new MediaPermissionDispatcher(this);
+
+    web_encrypted_media_client_.reset(new media::WebEncryptedMediaClientImpl(
+        cdm_factory.Pass(), media_permission_dispatcher_));
   }
   return web_encrypted_media_client_.get();
 }
 
 blink::WebMIDIClient* RenderFrameImpl::webMIDIClient() {
   if (!midi_dispatcher_)
     midi_dispatcher_ = new MidiDispatcher(this);
   return midi_dispatcher_;
 }
 
@@ skipping 1044 matching lines @@
 
 #if defined(ENABLE_BROWSER_CDMS)
 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
   if (!cdm_manager_)
     cdm_manager_ = new RendererCdmManager(this);
   return cdm_manager_;
 }
 #endif  // defined(ENABLE_BROWSER_CDMS)
 
 }  // namespace content