media: Add MojoCdmServiceContext.

components/html_viewer/media_factory.cc

Index: components/html_viewer/media_factory.cc
diff --git a/components/html_viewer/media_factory.cc b/components/html_viewer/media_factory.cc
index 07360e8cf9435b2ad05af5734a245eba12fb7d96..aa6dc57197e5ff7e1f4dafafe184983129d952fe 100644
--- a/components/html_viewer/media_factory.cc
+++ b/components/html_viewer/media_factory.cc
@@ -159,23 +159,11 @@ media::MediaServiceProvider* MediaFactory::GetMediaServiceProvider() {
   return media_service_provider_.get();
 }
 
-media::MediaServiceProvider* MediaFactory::GetMediaServiceProvider() {
-  if (!media_service_provider_) {
-    if (!mojo_service_provider_ptr_) {
-      mojo::URLRequestPtr request(mojo::URLRequest::New());
-      request->url = mojo::String::From("mojo:media");
-      shell_->ConnectToApplication(
-          request.Pass(), GetProxy(&mojo_service_provider_ptr_), nullptr);
-    }
-
-    media_service_provider_.reset(
-        new MojoMediaServiceProvider(mojo_service_provider_ptr_.get()));
-  }
-
-  return media_service_provider_.get();
-}
-

[xhwang, 2015/06/08 22:13:38]

This was accidentally introduced in the last CL. It's a duplicate of
l.146-l.160.

 media::MediaPermission* MediaFactory::GetMediaPermission() {
+  // TODO(xhwang): Replace DefaultMediaPermission with something real when
+  // permissions are supported in html_viewer.
+  NOTIMPLEMENTED();
+
   if (!media_permission_)
     media_permission_.reset(new media::DefaultMediaPermission(true));
   return media_permission_.get();