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

content/renderer/media/android/media_source_delegate.h

Index: content/renderer/media/android/media_source_delegate.h
diff --git a/webkit/renderer/media/android/media_source_delegate.h b/content/renderer/media/android/media_source_delegate.h
similarity index 95%
rename from webkit/renderer/media/android/media_source_delegate.h
rename to content/renderer/media/android/media_source_delegate.h
index dfe717f6dc145c99e15448b0e698aeda35d3e986..2f44491251b51db977bb3455ca1e937b5a8ce961 100644
--- a/webkit/renderer/media/android/media_source_delegate.h
+++ b/content/renderer/media/android/media_source_delegate.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_MEDIA_SOURCE_DELEGATE_H_
-#define WEBKIT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
+#ifndef CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
+#define CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
@@ -26,9 +26,8 @@ class MediaLog;
 struct MediaPlayerHostMsg_ReadFromDemuxerAck_Params;
 }
 
-namespace webkit_media {
+namespace content {
 
-class ProxyDecryptor;
 class WebMediaPlayerProxyAndroid;
 
 class MediaSourceDelegate : public media::DemuxerHost {
@@ -161,5 +160,6 @@ class MediaSourceDelegate : public media::DemuxerHost {
   DISALLOW_COPY_AND_ASSIGN(MediaSourceDelegate);
 };
 
-}  // namespace webkit_media
-#endif  // WEBKIT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
+}  // namespace content
+
+#endif  // CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_