Move WebMediaPlayerImpl and its dependencies to media/blink.

media/blink/webmediaplayer_params.h

Index: media/blink/webmediaplayer_params.h
diff --git a/content/renderer/media/webmediaplayer_params.h b/media/blink/webmediaplayer_params.h
similarity index 68%
rename from content/renderer/media/webmediaplayer_params.h
rename to media/blink/webmediaplayer_params.h
index cfaff62cc1d0801cea329ac3a0cc238f8afb0ef3..5cdf95ee2a675810fda1f236f9d6cccd1ea57c1f 100644
--- a/content/renderer/media/webmediaplayer_params.h
+++ b/media/blink/webmediaplayer_params.h
@@ -2,12 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_PARAMS_H_
-#define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_PARAMS_H_
+#ifndef MEDIA_BLINK_WEBMEDIAPLAYER_PARAMS_H_
+#define MEDIA_BLINK_WEBMEDIAPLAYER_PARAMS_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
-#include "content/renderer/media/crypto/encrypted_media_player_support.h"
+#include "media/base/media_export.h"
+#include "media/blink/encrypted_media_player_support.h"
 
 namespace base {
 class SingleThreadTaskRunner;
@@ -22,13 +23,10 @@ class AudioHardwareConfig;
 class AudioRendererSink;
 class GpuVideoAcceleratorFactories;
 class MediaLog;
-}
-
-namespace content {
 
 // Holds parameters for constructing WebMediaPlayerImpl without having
 // to plumb arguments through various abstraction layers.
-class WebMediaPlayerParams {
+class MEDIA_EXPORT WebMediaPlayerParams {
  public:
   // Callback used to create EncryptedMediaPlayerSupport instances. This
   // callback must always return a valid EncryptedMediaPlayerSupport object.
@@ -39,10 +37,10 @@ class WebMediaPlayerParams {
   // null.
   WebMediaPlayerParams(
       const base::Callback<void(const base::Closure&)>& defer_load_cb,
-      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<AudioRendererSink>& audio_renderer_sink,
+      const AudioHardwareConfig& audio_hardware_config,
+      const scoped_refptr<MediaLog>& media_log,
+      const scoped_refptr<GpuVideoAcceleratorFactories>& gpu_factories,
       const scoped_refptr<base::SingleThreadTaskRunner>&
           media_task_runner,
       const scoped_refptr<base::SingleThreadTaskRunner>&
@@ -56,19 +54,19 @@ class WebMediaPlayerParams {
     return defer_load_cb_;
   }
 
-  const scoped_refptr<media::AudioRendererSink>& audio_renderer_sink() const {
+  const scoped_refptr<AudioRendererSink>& audio_renderer_sink() const {
     return audio_renderer_sink_;
   }
 
-  const media::AudioHardwareConfig& audio_hardware_config() const {
+  const AudioHardwareConfig& audio_hardware_config() const {
     return audio_hardware_config_;
   }
 
-  const scoped_refptr<media::MediaLog>& media_log() const {
+  const scoped_refptr<MediaLog>& media_log() const {
     return media_log_;
   }
 
-  const scoped_refptr<media::GpuVideoAcceleratorFactories>&
+  const scoped_refptr<GpuVideoAcceleratorFactories>&
   gpu_factories() const {
     return gpu_factories_;
   }
@@ -88,10 +86,10 @@ class WebMediaPlayerParams {
 
  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<AudioRendererSink> audio_renderer_sink_;
+  const AudioHardwareConfig& audio_hardware_config_;
+  scoped_refptr<MediaLog> media_log_;
+  scoped_refptr<GpuVideoAcceleratorFactories> gpu_factories_;
   scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_;
   EncryptedMediaPlayerSupportCreateCB encrypted_media_player_support_cb_;
@@ -99,6 +97,6 @@ class WebMediaPlayerParams {
   DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerParams);
 };
 
-}  // namespace content
+}  // namespace media
 
-#endif  // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_PARAMS_H_
+#endif  // MEDIA_BLINK_WEBMEDIAPLAYER_PARAMS_H_