Implement WebRTC in Chrome for TV

webkit/media/android/webmediaplayer_android.h

Index: webkit/media/android/webmediaplayer_android.h
diff --git a/webkit/media/android/webmediaplayer_android.h b/webkit/media/android/webmediaplayer_android.h
index e07d48f24b5044ab4b798c9aeafec7e587664299..8c3369449c0f7cafaa0fe19cad125e831faf3ddc 100644
--- a/webkit/media/android/webmediaplayer_android.h
+++ b/webkit/media/android/webmediaplayer_android.h
@@ -12,10 +12,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/time.h"
-#if defined(GOOGLE_TV)
-#include "media/base/demuxer_stream.h"
-#endif
 #include "cc/layers/video_frame_provider.h"
+#include "media/base/android/media_player_bridge.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h"
@@ -37,9 +35,6 @@ class WebLayerImpl;
 
 namespace webkit_media {
 
-#if defined(GOOGLE_TV)
-class MediaSourceDelegate;
-#endif
 class WebMediaPlayerManagerAndroid;
 class WebMediaPlayerProxyAndroid;
 
@@ -63,8 +58,7 @@ class WebMediaPlayerAndroid
                         WebKit::WebMediaPlayerClient* client,
                         WebMediaPlayerManagerAndroid* manager,
                         WebMediaPlayerProxyAndroid* proxy,
-                        StreamTextureFactory* factory,
-                        media::MediaLog* media_log);
+                        StreamTextureFactory* factory);
   virtual ~WebMediaPlayerAndroid();
 
   // WebKit::WebMediaPlayer implementation.
@@ -186,24 +180,6 @@ class WebMediaPlayerAndroid
   // frame) if changed. Returns true only if the geometry has been changed since
   // the last call.
   bool RetrieveGeometryChange(gfx::RectF* rect);
-
-  virtual MediaKeyException generateKeyRequest(
-      const WebKit::WebString& key_system,
-      const unsigned char* init_data,
-      unsigned init_data_length) OVERRIDE;
-  virtual MediaKeyException addKey(
-      const WebKit::WebString& key_system,
-      const unsigned char* key,
-      unsigned key_length,
-      const unsigned char* init_data,
-      unsigned init_data_length,
-      const WebKit::WebString& session_id) OVERRIDE;
-  virtual MediaKeyException cancelKeyRequest(
-      const WebKit::WebString& key_system,
-      const WebKit::WebString& session_id) OVERRIDE;
-
-  // Called when DemuxerStreamPlayer needs to read data from ChunkDemuxer.
-  void OnReadFromDemuxer(media::DemuxerStream::Type type, bool seek_done);
 #endif
 
  protected:
@@ -221,10 +197,16 @@ class WebMediaPlayerAndroid
   // Requesting whether the surface texture peer needs to be reestablished.
   void SetNeedsEstablishPeer(bool needs_establish_peer);
 
-#if defined(GOOGLE_TV)
-  // Request external surface for out-of-band composition.
-  void RequestExternalSurface();
-#endif
+  void InitializeMediaPlayer(const WebKit::WebURL& url,
+                             media::MediaPlayerBridge::MediaType media_type);
+
+  bool NeedsExternalSurface();
+  void SetNeedsExternalSurface(bool needs_external_surface);
+
+  WebMediaPlayerProxyAndroid* proxy() { return proxy_; }
+  WebKit::WebFrame* frame() { return frame_; }
+  WebKit::WebMediaPlayerClient* client() { return client_; }
+  int player_id() { return player_id_; }
 
  private:
   void ReallocateVideoFrame();
@@ -305,8 +287,6 @@ class WebMediaPlayerAndroid
   // A rectangle represents the geometry of video frame, when computed last
   // time.
   gfx::RectF last_computed_rect_;
-
-  scoped_ptr<MediaSourceDelegate> media_source_delegate_;
 #endif
 
   // Proxy object that delegates method calls on Render Thread.