Encrypted Media: Add DefaultCdmFactory.

mojo/services/html_viewer/webmediaplayer_factory.cc

Index: mojo/services/html_viewer/webmediaplayer_factory.cc
diff --git a/mojo/services/html_viewer/webmediaplayer_factory.cc b/mojo/services/html_viewer/webmediaplayer_factory.cc
index 084cd736c9b19aaa9e4c21c30efa9cbff632b316..95adeb0c52123de3b721545c10e14b5364b8acf3 100644
--- a/mojo/services/html_viewer/webmediaplayer_factory.cc
+++ b/mojo/services/html_viewer/webmediaplayer_factory.cc
@@ -16,6 +16,7 @@
 #include "media/base/media_log.h"
 #include "media/blink/webmediaplayer_impl.h"
 #include "media/blink/webmediaplayer_params.h"
+#include "media/cdm/default_cdm_factory.h"
 #include "media/filters/default_renderer_factory.h"
 #include "media/filters/gpu_video_accelerator_factories.h"
 #include "media/mojo/interfaces/media_renderer.mojom.h"
@@ -99,9 +100,11 @@ blink::WebMediaPlayer* WebMediaPlayerFactory::CreateMediaPlayer(
       media_log, GetMediaThreadTaskRunner(), compositor_task_runner_, nullptr);
   base::WeakPtr<media::WebMediaPlayerDelegate> delegate;
 
-  // TODO(xhwang): Provide a media based CdmFactory implementation.
-  return new media::WebMediaPlayerImpl(
-      frame, client, delegate, media_renderer_factory.Pass(), nullptr, params);
+  scoped_ptr<media::CdmFactory> cdm_factory(new media::DefaultCdmFactory());
+
+  return new media::WebMediaPlayerImpl(frame, client, delegate,
+                                       media_renderer_factory.Pass(),
+                                       cdm_factory.Pass(), params);
 #endif
 }