Remove RenderThreadImpl dependencies from WebMediaPlayerImpl.

content/renderer/media/webmediaplayer_params.h

Index: content/renderer/media/webmediaplayer_params.h
diff --git a/content/renderer/media/webmediaplayer_params.h b/content/renderer/media/webmediaplayer_params.h
index 87105fef85551d547a9af42821fa5d2345542b7b..fb1dad7730889cf6f8637ce5ed5ab0fe18a11015 100644
--- a/content/renderer/media/webmediaplayer_params.h
+++ b/content/renderer/media/webmediaplayer_params.h
@@ -7,9 +7,17 @@
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
+#include "content/renderer/media/crypto/encrypted_media_player_support.h"
+
+namespace base {
+class SingleThreadTaskRunner;
+}
 
 namespace media {
+class AudioHardwareConfig;
 class AudioRendererSink;
+class GpuVideoAcceleratorFactories;
+class MediaLog;
 }
 
 namespace content {
@@ -21,7 +29,15 @@ class WebMediaPlayerParams {
   // Parameters may be null.

[scherkus (not reviewing), 2014/08/28 18:36:12]

is this still true?

[acolwell GONE FROM CHROMIUM, 2014/08/28 19:07:28]

No. Updated comment to indicate which ones can be null.

   WebMediaPlayerParams(
       const base::Callback<void(const base::Closure&)>& defer_load_cb,
-      const scoped_refptr<media::AudioRendererSink>& audio_renderer_sink);
+      const scoped_refptr<media::AudioRendererSink>& audio_renderer_sink,
+      const media::AudioHardwareConfig* audio_hardware_config,
+      const scoped_refptr<media::MediaLog>& media_log,
+      const scoped_refptr<media::GpuVideoAcceleratorFactories>& gpu_factories,
+      const scoped_refptr<base::SingleThreadTaskRunner>&
+          media_task_runner,
+      const scoped_refptr<base::SingleThreadTaskRunner>&
+          compositor_task_runner,
+      scoped_ptr<EncryptedMediaPlayerSupport> encrypted_media_player_support);
   ~WebMediaPlayerParams();
 
   base::Callback<void(const base::Closure&)> defer_load_cb() const {
@@ -32,9 +48,42 @@ class WebMediaPlayerParams {
     return audio_renderer_sink_;
   }
 
+  const media::AudioHardwareConfig* audio_hardware_config() const {
+    return audio_hardware_config_;
+  }
+
+  const scoped_refptr<media::MediaLog>& media_log() const {
+    return media_log_;
+  }
+
+  const scoped_refptr<media::GpuVideoAcceleratorFactories>&
+  gpu_factories() const {
+    return gpu_factories_;
+  }
+
+  const scoped_refptr<base::SingleThreadTaskRunner>&
+  media_task_runner() const {
+    return media_task_runner_;
+  }
+
+  const scoped_refptr<base::SingleThreadTaskRunner>&
+  compositor_task_runner() const {
+    return compositor_task_runner_;
+  }
+
+  scoped_ptr<EncryptedMediaPlayerSupport> encrypted_media_player_support() {
+    return encrypted_media_player_support_.Pass();

[scherkus (not reviewing), 2014/08/28 18:36:12]

Having this be the only method that actually passes ownership seems odd,
especially since it looks like WMPI can create a EMPS with a client pointer. It
looks like it's the main cause of changing WMPP to a scoped_ptr<>

I was wondering whether it makes sense to either: 
 a) require media_blink embedders to provide an implementation of
EncryptedMediaPlayerSupport::Create() that gets resolved at link-time
 b) change WMPP to accept a EMPS-creating callback/function pointer and expose a
CreateEMPS() method

[acolwell GONE FROM CHROMIUM, 2014/08/28 19:07:28]

Yeah. Not super happy about this.
This is what the original code did, but it causes linking problems because it
means media/blink depends on content/, which then depends on media/blink. :/
I think this is a reasonable compromise, but changes this code params object
from essentially being inert to containing behavior.

[scherkus (not reviewing), 2014/08/28 19:12:15]

Yeah ... I'm fine leaving this roughly as they are now as WMPP will likely
evolve/split into a more proper embedder interface over time.

For example, most of these parameters are static for a process' lifetime. Only
AudioRendererSink, MediaLog, and EMPS are created per-WMPI.

+  }
+
  private:
   base::Callback<void(const base::Closure&)> defer_load_cb_;
   scoped_refptr<media::AudioRendererSink> audio_renderer_sink_;
+  const media::AudioHardwareConfig* audio_hardware_config_;
+  scoped_refptr<media::MediaLog> media_log_;
+  scoped_refptr<media::GpuVideoAcceleratorFactories> gpu_factories_;
+  scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_;
+  scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_;
+  scoped_ptr<EncryptedMediaPlayerSupport> encrypted_media_player_support_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerParams);
 };