Revert 259154 "Remove HasAudio(), HasVideo(), GetInitialNaturalS..."

trunk/src/content/renderer/media/webmediaplayer_impl.h

Index: trunk/src/content/renderer/media/webmediaplayer_impl.h
===================================================================
--- trunk/src/content/renderer/media/webmediaplayer_impl.h	(revision 259158)
+++ trunk/src/content/renderer/media/webmediaplayer_impl.h	(working copy)
@@ -166,8 +166,8 @@
   void OnPipelineSeek(media::PipelineStatus status);
   void OnPipelineEnded();
   void OnPipelineError(media::PipelineStatus error);
-  void OnPipelineMetadata(media::PipelineMetadata metadata);
-  void OnPipelinePrerollCompleted();
+  void OnPipelineBufferingState(
+      media::Pipeline::BufferingState buffering_state);
   void OnDemuxerOpened();
   void OnKeyAdded(const std::string& session_id);
   void OnKeyError(const std::string& session_id,
@@ -261,9 +261,6 @@
   // The LoadType passed in the |load_type| parameter of the load() call.
   LoadType load_type_;
 
-  // Cache of metadata for answering hasAudio(), hasVideo(), and naturalSize().
-  media::PipelineMetadata pipeline_metadata_;
-
   // Playback state.
   //
   // TODO(scherkus): we have these because Pipeline favours the simplicity of a
@@ -326,6 +323,7 @@
   // Video rendering members.
   VideoFrameCompositor compositor_;
   media::SkCanvasVideoRenderer skcanvas_video_renderer_;
+  gfx::Size natural_size_;
 
   // The compositor layer for displaying the video content when using composited
   // playback.