media: Add MojoCdmServiceContext.

components/html_viewer/media_factory.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 "components/html_viewer/media_factory.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
@@ skipping 141 matching lines @@
           request.Pass(), GetProxy(&mojo_service_provider_ptr_), nullptr);
     }
 
     media_service_provider_.reset(
         new MojoMediaServiceProvider(mojo_service_provider_ptr_.get()));
   }
 
   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();
 }
 
 media::CdmFactory* MediaFactory::GetCdmFactory() {
   if (!cdm_factory_)
     cdm_factory_.reset(new media::DefaultCdmFactory());
   return cdm_factory_.get();
 }
@@ skipping 13 matching lines @@
 scoped_refptr<base::SingleThreadTaskRunner>
 MediaFactory::GetMediaThreadTaskRunner() {
   if (!media_thread_.IsRunning())
     media_thread_.Start();
 
   return media_thread_.task_runner();
 }
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace html_viewer