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

content/renderer/media/android/media_info_loader.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // 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>
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
+#include "third_party/WebKit/public/platform/WebURLLoaderClient.h"
 #include "third_party/WebKit/public/web/WebMediaPlayer.h"
-#include "third_party/WebKit/public/platform/WebURLLoaderClient.h"
 #include "webkit/renderer/media/active_loader.h"
 
 namespace WebKit {
 class WebFrame;
 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
 // whether the URL passes a CORS access check.
 class MediaInfoLoader : private WebKit::WebURLLoaderClient {
  public:
   // Status codes for start operations on MediaInfoLoader.
   enum Status {
     // The operation failed, which may have been due to:
     //   - Page navigation
@@ skipping 62 matching lines @@
   virtual void didFail(
       WebKit::WebURLLoader* loader,
       const WebKit::WebURLError&);
 
   void DidBecomeReady(Status status);
 
   // Injected WebURLLoader instance for testing purposes.
   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_;
   WebKit::WebMediaPlayer::CORSMode cors_mode_;
   bool single_origin_;
 
   ReadyCB ready_cb_;
   base::TimeTicks start_time_;
 
   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_