From 16ff136e88d757f4ca92291e8e221682cb1e8c63 Mon Sep 17 00:00:00 2001
From: xhwang <xhwang@chromium.org>
Date: Tue, 18 Nov 2014 16:16:34 -0800
Subject: Move EncryptedMediaPlayerSupport and ProxyDecryptor from content to
 media.

Summary of changes:
- Drop EncryptedMediaPlayerSupport interface.
- Move EncryptedMediaPlayerSupportImpl to media and rename it to
  EncryptedMediaPlayerSupport.
- Drop NullEncryptedMediaPlayerSupport.
- Drop EncryptedMediaPlayerSupportCreateCB from WebMediaPlayerParams, and let WebMediaPlayerImpl always own a EncryptedMediaPlayerSupport.
- EncryptedMediaPlayerSupport takes an external CdmFactory.
- Pass a CdmFactory to WebMediaPlayerImpl's constructor.
- Move ProxyDecryptor to media.

BUG=422730

Review URL: https://codereview.chromium.org/737483002

Cr-Commit-Position: refs/heads/master@{#304712}
---
 mojo/services/html_viewer/webmediaplayer_factory.cc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'mojo')

diff --git a/mojo/services/html_viewer/webmediaplayer_factory.cc b/mojo/services/html_viewer/webmediaplayer_factory.cc
index fbb8e9d..6c4653a 100644
--- a/mojo/services/html_viewer/webmediaplayer_factory.cc
+++ b/mojo/services/html_viewer/webmediaplayer_factory.cc
@@ -15,7 +15,6 @@
 #include "media/base/media.h"
 #include "media/base/media_log.h"
 #include "media/base/renderer.h"
-#include "media/blink/null_encrypted_media_player_support.h"
 #include "media/blink/webmediaplayer_impl.h"
 #include "media/blink/webmediaplayer_params.h"
 #include "media/filters/gpu_video_accelerator_factories.h"
@@ -72,12 +71,12 @@ blink::WebMediaPlayer* WebMediaPlayerFactory::CreateMediaPlayer(
       scoped_refptr<media::GpuVideoAcceleratorFactories>(),
       GetMediaThreadTaskRunner(),
       compositor_task_runner_,
-      base::Bind(&media::NullEncryptedMediaPlayerSupport::Create),
       NULL);
   base::WeakPtr<media::WebMediaPlayerDelegate> delegate;
 
-  return new media::WebMediaPlayerImpl(
-      frame, client, delegate, renderer.Pass(), params);
+  // TODO(xhwang): Provide a media based CdmFactory implementation.
+  return new media::WebMediaPlayerImpl(frame, client, delegate, renderer.Pass(),
+                                       nullptr, params);
 #endif
 }
 
-- 
cgit v1.1