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

content/renderer/media/android/webmediaplayer_android.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_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
-#define WEBKIT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
+#ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
+#define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
 
 #include <jni.h>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "cc/layers/video_frame_provider.h"
+#include "content/renderer/media/android/media_info_loader.h"
+#include "content/renderer/media/android/media_source_delegate.h"
+#include "content/renderer/media/android/stream_texture_factory_android.h"
 #include "media/base/android/media_player_android.h"
 #include "media/base/demuxer_stream.h"
 #include "media/base/media_keys.h"
 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/web/WebMediaPlayer.h"
 #include "ui/gfx/rect_f.h"
-#include "webkit/renderer/media/android/media_source_delegate.h"
-#include "webkit/renderer/media/android/stream_texture_factory_android.h"
 #include "webkit/renderer/media/crypto/proxy_decryptor.h"
-#include "webkit/renderer/media/media_info_loader.h"
 
 namespace media {
 class Demuxer;
 class MediaLog;
 }
 
 namespace WebKit {
 class WebFrame;
 }
 
 namespace webkit {
 class WebLayerImpl;
 }
 
 namespace webkit_media {
+class WebMediaPlayerDelegate;
+}
+
+namespace content {
 
 class MediaStreamClient;
-class WebMediaPlayerDelegate;
 class WebMediaPlayerManagerAndroid;
 class WebMediaPlayerProxyAndroid;
 
 #if defined(GOOGLE_TV)
 class MediaStreamAudioRenderer;
 #endif
 
 // This class implements WebKit::WebMediaPlayer by keeping the android
 // media player in the browser process. It listens to all the status changes
 // sent from the browser process and sends playback controls to the media
 // player.
 class WebMediaPlayerAndroid
     : public WebKit::WebMediaPlayer,
       public cc::VideoFrameProvider,
       public base::MessageLoop::DestructionObserver,
       public base::SupportsWeakPtr<WebMediaPlayerAndroid> {
  public:
   // Construct a WebMediaPlayerAndroid object. This class communicates
   // with the MediaPlayerAndroid object in the browser process through
   // |proxy|.
   // TODO(qinmin): |frame| argument is used to determine whether the current
   // player can enter fullscreen. This logic should probably be moved into
   // blink, so that enterFullscreen() will not be called if another video is
   // already in fullscreen.
-  WebMediaPlayerAndroid(WebKit::WebFrame* frame,
-                        WebKit::WebMediaPlayerClient* client,
-                        base::WeakPtr<WebMediaPlayerDelegate> delegate,
-                        WebMediaPlayerManagerAndroid* manager,
-                        WebMediaPlayerProxyAndroid* proxy,
-                        StreamTextureFactory* factory,
-                        media::MediaLog* media_log);
+  WebMediaPlayerAndroid(
+      WebKit::WebFrame* frame,
+      WebKit::WebMediaPlayerClient* client,
+      base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate,
+      WebMediaPlayerManagerAndroid* manager,
+      WebMediaPlayerProxyAndroid* proxy,
+      StreamTextureFactory* factory,
+      media::MediaLog* media_log);
   virtual ~WebMediaPlayerAndroid();
 
   // WebKit::WebMediaPlayer implementation.
   virtual void enterFullscreen();
   virtual void exitFullscreen();
   virtual bool canEnterFullscreen() const;
 
   // Resource loading.
   virtual void load(const WebKit::WebURL& url, CORSMode cors_mode);
   virtual void load(const WebKit::WebURL& url,
@@ skipping 186 matching lines @@
 
   WebKit::WebFrame* const frame_;
 
   WebKit::WebMediaPlayerClient* const client_;
 
   // |delegate_| is used to notify the browser process of the player status, so
   // that the browser process can control screen locks.
   // 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<WebMediaPlayerDelegate> delegate_;
+  base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate_;
 
   // Save the list of buffered time ranges.
   WebKit::WebTimeRanges buffered_;
 
   // Size of the video.
   WebKit::WebSize natural_size_;
 
   // The video frame object used for rendering by the compositor.
   scoped_refptr<media::VideoFrame> current_frame_;
 
@@ skipping 101 matching lines @@
 
   // The currently selected key system. Empty string means that no key system
   // has been selected.
   WebKit::WebString current_key_system_;
 
   // Temporary for EME v0.1. In the future the init data type should be passed
   // through GenerateKeyRequest() directly from WebKit.
   std::string init_data_type_;
 
   // The decryptor that manages decryption keys and decrypts encrypted frames.
-  scoped_ptr<ProxyDecryptor> decryptor_;
+  scoped_ptr<webkit_media::ProxyDecryptor> decryptor_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
 };
 
-}  // namespace webkit_media
+}  // namespace content
 
-#endif  // WEBKIT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
+#endif  // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_