Move webkit/renderer/media/android/ to content/renderer/media/android/.

content/renderer/media/android/webmediaplayer_proxy_android.h

Index: content/renderer/media/android/webmediaplayer_proxy_android.h
diff --git a/webkit/renderer/media/android/webmediaplayer_proxy_android.h b/content/renderer/media/android/webmediaplayer_proxy_android.h
similarity index 91%
rename from webkit/renderer/media/android/webmediaplayer_proxy_android.h
rename to content/renderer/media/android/webmediaplayer_proxy_android.h
index d900544d8a7ebbb9cb67235798dc67fb842e136c..2f7678486768ca17e1af88ba0bb6d012695896ef 100644
--- a/webkit/renderer/media/android/webmediaplayer_proxy_android.h
+++ b/content/renderer/media/android/webmediaplayer_proxy_android.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_PROXY_ANDROID_H_
-#define WEBKIT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_PROXY_ANDROID_H_
+#ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_PROXY_ANDROID_H_
+#define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_PROXY_ANDROID_H_
 
 #include <string>
 
@@ -12,7 +12,7 @@
 #include "media/base/android/demuxer_stream_player_params.h"
 #include "media/base/android/media_player_android.h"
 
-namespace webkit_media {
+namespace content {
 
 // An interface to facilitate the IPC between the browser side
 // android::MediaPlayer and the WebMediaPlayerImplAndroid in the renderer
@@ -83,6 +83,6 @@ class WebMediaPlayerProxyAndroid {
                                const base::TimeDelta& duration) = 0;
 };
 
-}  // namespace webkit_media
+}  // namespace content
 
-#endif  // WEBKIT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_PROXY_ANDROID_H_
+#endif  // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_PROXY_ANDROID_H_