Eliminate MediaPlayer & MediaPlayerClient abstractions

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 53 matching lines @@
   media::InitializeMediaLibrary();
 }
 
 MediaFactory::~MediaFactory() {
 }
 
 blink::WebMediaPlayer* MediaFactory::CreateMediaPlayer(
     blink::WebLocalFrame* frame,
     const blink::WebURL& url,
     blink::WebMediaPlayerClient* client,
+    blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
     blink::WebContentDecryptionModule* initial_cdm,
     mojo::Shell* shell) {
 #if defined(OS_ANDROID)
   // TODO(xhwang): Get CreateMediaPlayer working on android.
   return nullptr;
 #else
   scoped_refptr<media::MediaLog> media_log(new media::MediaLog());
   scoped_ptr<media::RendererFactory> media_renderer_factory;
 
   if (enable_mojo_media_renderer_) {
     media_renderer_factory.reset(
         new media::MojoRendererFactory(GetMediaServiceProvider()));
   } else {
     media_renderer_factory.reset(
         new media::DefaultRendererFactory(media_log,
                                           nullptr,  // No GPU factory.
                                           GetAudioHardwareConfig()));
   }
 
   media::WebMediaPlayerParams params(
       media::WebMediaPlayerParams::DeferLoadCB(), CreateAudioRendererSink(),
       media_log, GetMediaThreadTaskRunner(), compositor_task_runner_,
       media::WebMediaPlayerParams::Context3DCB(), GetMediaPermission(),
       initial_cdm);
   base::WeakPtr<media::WebMediaPlayerDelegate> delegate;
 
-  return new media::WebMediaPlayerImpl(frame, client, delegate,
-                                       media_renderer_factory.Pass(),
+  return new media::WebMediaPlayerImpl(frame, client, encrypted_client,
+                                       delegate, media_renderer_factory.Pass(),
                                        GetCdmFactory(), params);
 #endif  // defined(OS_ANDROID)
 }
 
 blink::WebEncryptedMediaClient* MediaFactory::GetEncryptedMediaClient() {
   if (!web_encrypted_media_client_) {
     web_encrypted_media_client_.reset(new media::WebEncryptedMediaClientImpl(
         base::Bind(&AreSecureCodecsSupported), GetCdmFactory(),
         GetMediaPermission()));
   }
@@ skipping 47 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