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

content/renderer/media/webmediaplayer_impl.h

Index: content/renderer/media/webmediaplayer_impl.h
diff --git a/webkit/renderer/media/webmediaplayer_impl.h b/content/renderer/media/webmediaplayer_impl.h
similarity index 98%
rename from webkit/renderer/media/webmediaplayer_impl.h
rename to content/renderer/media/webmediaplayer_impl.h
index a691c4d8edfd8312aabc640fcf87d89785744b31..e5928e0d48089a33ce260c256125b02210888507 100644
--- a/webkit/renderer/media/webmediaplayer_impl.h
+++ b/content/renderer/media/webmediaplayer_impl.h
@@ -17,8 +17,8 @@
 // at destruction of this class we will need to unhook it from destruction event
 // list of the main thread.
 
-#ifndef WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
-#define WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
+#ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
+#define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
 
 #include <string>
 #include <vector>
@@ -64,8 +64,7 @@ namespace webkit {
 class WebLayerImpl;
 }
 
-namespace webkit_media {
-
+namespace content {
 class BufferedDataSource;
 class WebAudioSourceProviderImpl;
 class WebMediaPlayerDelegate;
@@ -329,7 +328,7 @@ class WebMediaPlayerImpl
   bool supports_save_;
 
   // The decryptor that manages decryption keys and decrypts encrypted frames.
-  scoped_ptr<ProxyDecryptor> decryptor_;
+  scoped_ptr<webkit_media::ProxyDecryptor> decryptor_;
 
   bool starting_;
 
@@ -372,6 +371,6 @@ class WebMediaPlayerImpl
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
 };
 
-}  // namespace webkit_media
+}  // namespace content
 
-#endif  // WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
+#endif  // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_