Migrate MediaStream test code from content/shell/renderer/ to content/test/.

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 CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
 
 #include <jni.h>
 #include <string>
 #include <vector>
@@ skipping 25 matching lines @@
 }
 
 namespace WebKit {
 class WebFrame;
 }
 
 namespace webkit {
 class WebLayerImpl;
 }
 
-namespace webkit_media {
+namespace content {
 class WebMediaPlayerDelegate;
+class WebMediaPlayerManagerAndroid;
+class WebMediaPlayerProxyAndroid;
 
 #if defined(GOOGLE_TV)
 class MediaStreamAudioRenderer;
 class MediaStreamClient;
 #endif
-}
-
-namespace content {
-
-class WebMediaPlayerManagerAndroid;
-class WebMediaPlayerProxyAndroid;
 
 // 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<webkit_media::WebMediaPlayerDelegate> delegate,
+      base::WeakPtr<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;
@@ skipping 191 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<webkit_media::WebMediaPlayerDelegate> delegate_;
+  base::WeakPtr<WebMediaPlayerDelegate> delegate_;
 
   // Save the list of buffered time ranges.
   WebKit::WebTimeRanges buffered_;
 
   // Size of the video.
   WebKit::WebSize natural_size_;
 
   // Size that has been sent to StreamTexture.
   WebKit::WebSize cached_stream_texture_size_;
 
@@ skipping 121 matching lines @@
 
   // The decryptor that manages decryption keys and decrypts encrypted frames.
   scoped_ptr<webkit_media::ProxyDecryptor> decryptor_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_