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

content/renderer/media/android/webmediaplayer_android.h

Index: content/renderer/media/android/webmediaplayer_android.h
diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h
index 66321d0bddb40e73dcb43ca761c50540509e78c2..3bb7eb1956fccbdec746a32cc4931b78642cd1a8 100644
--- a/content/renderer/media/android/webmediaplayer_android.h
+++ b/content/renderer/media/android/webmediaplayer_android.h
@@ -41,7 +41,7 @@ namespace webkit {
 class WebLayerImpl;
 }
 
-namespace webkit_media {
+namespace content {
 class WebMediaPlayerDelegate;
 
 #if defined(GOOGLE_TV)
@@ -75,7 +75,7 @@ class WebMediaPlayerAndroid
   WebMediaPlayerAndroid(
       WebKit::WebFrame* frame,
       WebKit::WebMediaPlayerClient* client,
-      base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate,
+      base::WeakPtr<WebMediaPlayerDelegate> delegate,
       WebMediaPlayerManagerAndroid* manager,
       WebMediaPlayerProxyAndroid* proxy,
       StreamTextureFactory* factory,
@@ -287,7 +287,7 @@ class WebMediaPlayerAndroid
   // TODO(qinmin): Currently android mediaplayer takes care of the screen
   // lock. So this is only used for media source. Will apply this to regular
   // media tag once http://crbug.com/247892 is fixed.
-  base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate_;
+  base::WeakPtr<WebMediaPlayerDelegate> delegate_;
 
   // Save the list of buffered time ranges.
   WebKit::WebTimeRanges buffered_;