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

content/renderer/media/android/media_info_loader.h

Index: content/renderer/media/android/media_info_loader.h
diff --git a/webkit/renderer/media/media_info_loader.h b/content/renderer/media/android/media_info_loader.h
similarity index 92%
rename from webkit/renderer/media/media_info_loader.h
rename to content/renderer/media/android/media_info_loader.h
index 0e403bd141385e5cfb170d923829c529c2d99532..d958f78d6f95c701b5a09b60491604507c672e2c 100644
--- a/webkit/renderer/media/media_info_loader.h
+++ b/content/renderer/media/android/media_info_loader.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_MEDIA_INFO_LOADER_H_
-#define WEBKIT_RENDERER_MEDIA_MEDIA_INFO_LOADER_H_
+#ifndef CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_INFO_LOADER_H_
+#define CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_INFO_LOADER_H_
 
 #include <string>
 
@@ -11,8 +11,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
-#include "third_party/WebKit/public/web/WebMediaPlayer.h"
 #include "third_party/WebKit/public/platform/WebURLLoaderClient.h"
+#include "third_party/WebKit/public/web/WebMediaPlayer.h"
 #include "webkit/renderer/media/active_loader.h"
 
 namespace WebKit {
@@ -21,7 +21,7 @@ class WebURLLoader;
 class WebURLRequest;
 }
 
-namespace webkit_media {
+namespace content {
 
 // This class provides additional information about a media URL. Currently it
 // can be used to determine if a media URL has a single security origin and
@@ -104,7 +104,7 @@ class MediaInfoLoader : private WebKit::WebURLLoaderClient {
   scoped_ptr<WebKit::WebURLLoader> test_loader_;
 
   // Keeps track of an active WebURLLoader and associated state.
-  scoped_ptr<ActiveLoader> active_loader_;
+  scoped_ptr<webkit_media::ActiveLoader> active_loader_;
 
   bool loader_failed_;
   GURL url_;
@@ -117,6 +117,6 @@ class MediaInfoLoader : private WebKit::WebURLLoaderClient {
   DISALLOW_COPY_AND_ASSIGN(MediaInfoLoader);
 };
 
-}  // namespace webkit_media
+}  // namespace content
 
-#endif  // WEBKIT_RENDERER_MEDIA_MEDIA_INFO_LOADER_H_
+#endif  // CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_INFO_LOADER_H_