media: Add DefaultMediaPermission.

mojo/services/html_viewer/html_document.cc

 // Copyright 2014 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 "mojo/services/html_viewer/html_document.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/thread_task_runner_handle.h"
 #include "media/blink/webencryptedmediaclient_impl.h"
 #include "media/cdm/default_cdm_factory.h"
+#include "media/filters/default_media_permission.h"
 #include "mojo/services/html_viewer/blink_input_events_type_converters.h"
 #include "mojo/services/html_viewer/blink_url_request_type_converters.h"
 #include "mojo/services/html_viewer/weblayertreeview_impl.h"
 #include "mojo/services/html_viewer/webmediaplayer_factory.h"
 #include "mojo/services/html_viewer/webstoragenamespace_impl.h"
 #include "mojo/services/html_viewer/weburlloader_impl.h"
 #include "skia/ext/refptr.h"
 #include "third_party/WebKit/public/platform/Platform.h"
 #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
@@ skipping 173 matching lines @@
     const blink::WebURL& url,
     blink::WebMediaPlayerClient* client) {
   return createMediaPlayer(frame, url, client, nullptr);
 }
 
 blink::WebMediaPlayer* HTMLDocument::createMediaPlayer(
     blink::WebLocalFrame* frame,
     const blink::WebURL& url,
     blink::WebMediaPlayerClient* client,
     blink::WebContentDecryptionModule* initial_cdm) {
-  return web_media_player_factory_->CreateMediaPlayer(frame, url, client,
-                                                      initial_cdm, shell_);
+  if (!media_permission_)
+    media_permission_.reset(new media::DefaultMediaPermission(true));
+
+  return web_media_player_factory_->CreateMediaPlayer(
+      frame, url, client, media_permission_.get(), initial_cdm, shell_);
 }
 
 blink::WebFrame* HTMLDocument::createChildFrame(
     blink::WebLocalFrame* parent,
     const blink::WebString& frameName,
     blink::WebSandboxFlags sandboxFlags) {
   blink::WebLocalFrame* web_frame = blink::WebLocalFrame::create(this);
   parent->appendChild(web_frame);
   return web_frame;
 }
@@ skipping 41 matching lines @@
 void HTMLDocument::didNavigateWithinPage(
     blink::WebLocalFrame* frame,
     const blink::WebHistoryItem& history_item,
     blink::WebHistoryCommitType commit_type) {
   if (navigator_host_.get())
     navigator_host_->DidNavigateLocally(history_item.urlString().utf8());
 }
 
 blink::WebEncryptedMediaClient* HTMLDocument::encryptedMediaClient() {
   if (!web_encrypted_media_client_) {
-    // TODO(xhwang): Hook up permission services and add a MediaPermission
-    // implementation for HTMLDocument.
+    if (!media_permission_)
+      media_permission_.reset(new media::DefaultMediaPermission(true));
     web_encrypted_media_client_.reset(new media::WebEncryptedMediaClientImpl(
-        make_scoped_ptr(new media::DefaultCdmFactory()), nullptr));
+        make_scoped_ptr(new media::DefaultCdmFactory()),
+        media_permission_.get()));
   }
   return web_encrypted_media_client_.get();
 }
 
 void HTMLDocument::OnViewBoundsChanged(View* view,
                                        const Rect& old_bounds,
                                        const Rect& new_bounds) {
   DCHECK_EQ(view, root_);
   web_view_->resize(
       blink::WebSize(view->bounds().width, view->bounds().height));
 }
 
 void HTMLDocument::OnViewDestroyed(View* view) {
   DCHECK_EQ(view, root_);
   root_ = nullptr;
 }
 
 void HTMLDocument::OnViewInputEvent(View* view, const mojo::EventPtr& event) {
   scoped_ptr<blink::WebInputEvent> web_event =
       event.To<scoped_ptr<blink::WebInputEvent>>();
   if (web_event)
     web_view_->handleInputEvent(*web_event);
 }
 
 }  // namespace html_viewer