Migrate webkit/renderer/media/ to content/renderer/media/.

content/renderer/media/webmediaplayer_impl.cc

Index: content/renderer/media/webmediaplayer_impl.cc
diff --git a/webkit/renderer/media/webmediaplayer_impl.cc b/content/renderer/media/webmediaplayer_impl.cc
similarity index 98%
rename from webkit/renderer/media/webmediaplayer_impl.cc
rename to content/renderer/media/webmediaplayer_impl.cc
index 65fd073d3619dc666c8ea2e2766e1f9cc57bf091..4b99b2049052ba02e8660ec5838dbf7ddf23637d 100644
--- a/webkit/renderer/media/webmediaplayer_impl.cc
+++ b/content/renderer/media/webmediaplayer_impl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/renderer/media/webmediaplayer_impl.h"
+#include "content/renderer/media/webmediaplayer_impl.h"
 
 #include <algorithm>
 #include <limits>
@@ -18,6 +18,14 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "cc/layers/video_layer.h"
+#include "content/renderer/media/buffered_data_source.h"
+#include "content/renderer/media/texttrack_impl.h"
+#include "content/renderer/media/webaudiosourceprovider_impl.h"
+#include "content/renderer/media/webinbandtexttrack_impl.h"
+#include "content/renderer/media/webmediaplayer_delegate.h"
+#include "content/renderer/media/webmediaplayer_params.h"
+#include "content/renderer/media/webmediaplayer_util.h"
+#include "content/renderer/media/webmediasourceclient_impl.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "media/audio/null_audio_sink.h"
 #include "media/base/bind_to_loop.h"
@@ -45,15 +53,7 @@
 #include "v8/include/v8.h"
 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"
 #include "webkit/renderer/compositor_bindings/web_layer_impl.h"
-#include "webkit/renderer/media/buffered_data_source.h"
 #include "webkit/renderer/media/crypto/key_systems.h"
-#include "webkit/renderer/media/texttrack_impl.h"
-#include "webkit/renderer/media/webaudiosourceprovider_impl.h"
-#include "webkit/renderer/media/webinbandtexttrack_impl.h"
-#include "webkit/renderer/media/webmediaplayer_delegate.h"
-#include "webkit/renderer/media/webmediaplayer_params.h"
-#include "webkit/renderer/media/webmediaplayer_util.h"
-#include "webkit/renderer/media/webmediasourceclient_impl.h"
 
 using WebKit::WebCanvas;
 using WebKit::WebMediaPlayer;
@@ -61,6 +61,9 @@ using WebKit::WebRect;
 using WebKit::WebSize;
 using WebKit::WebString;
 using media::PipelineStatus;
+using webkit_media::IsSupportedKeySystem;
+using webkit_media::KeySystemNameForUMA;
+using webkit_media::ProxyDecryptor;
 
 namespace {
 
@@ -97,7 +100,7 @@ const double kMaxRate = 16.0;
 const char* kMediaEme = "Media.EME.";
 }  // namespace
 
-namespace webkit_media {
+namespace content {
 
 #define COMPILE_ASSERT_MATCHING_ENUM(name) \
   COMPILE_ASSERT(static_cast<int>(WebMediaPlayer::CORSMode ## name) == \
@@ -383,7 +386,7 @@ void WebMediaPlayerImpl::setVolume(double volume) {
 
 #define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, chromium_name) \
     COMPILE_ASSERT(static_cast<int>(WebMediaPlayer::webkit_name) == \
-                   static_cast<int>(webkit_media::chromium_name), \
+                   static_cast<int>(content::chromium_name), \
                    mismatching_enums)
 COMPILE_ASSERT_MATCHING_ENUM(PreloadNone, NONE);
 COMPILE_ASSERT_MATCHING_ENUM(PreloadMetaData, METADATA);
@@ -394,7 +397,7 @@ void WebMediaPlayerImpl::setPreload(WebMediaPlayer::Preload preload) {
   DCHECK(main_loop_->BelongsToCurrentThread());
 
   if (data_source_)
-    data_source_->SetPreload(static_cast<webkit_media::Preload>(preload));
+    data_source_->SetPreload(static_cast<content::Preload>(preload));
 }
 
 bool WebMediaPlayerImpl::hasVideo() const {
@@ -1223,4 +1226,4 @@ void WebMediaPlayerImpl::FrameReady(
       &WebMediaPlayerImpl::Repaint, AsWeakPtr()));
 }
 
-}  // namespace webkit_media
+}  // namespace content