Remove MediaFormat once and for all.

BUG=28206
TEST=media_unittests, unit_tests, layout_tests

Review URL: http://codereview.chromium.org/7452016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93282 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 1 insertions, 24 deletions

diff --git a/webkit/glue/media/buffered_data_source.cc b/webkit/glue/media/buffered_data_source.cc
index 4e38b54..c125dd6 100644
--- a/webkit/glue/media/buffered_data_source.cc
+++ b/webkit/glue/media/buffered_data_source.cc
@@ -103,8 +103,6 @@ void BufferedDataSource::Initialize(const std::string& url,
   DCHECK(callback);
   initialize_callback_.reset(callback);
 
-  media_format_.SetAsString(media::MediaFormat::kURL, url);
-
   // Post a task to complete the initialization task.
   render_loop_->PostTask(FROM_HERE,
       NewRunnableMethod(this, &BufferedDataSource::InitializeTask));
diff --git a/webkit/glue/media/buffered_data_source.h b/webkit/glue/media/buffered_data_source.h
index a1444e9..408d095 100644
--- a/webkit/glue/media/buffered_data_source.h
+++ b/webkit/glue/media/buffered_data_source.h
@@ -43,10 +43,6 @@ class BufferedDataSource : public WebDataSource {
   virtual bool IsStreaming();
   virtual void SetPreload(media::Preload preload);
 
-  const media::MediaFormat& media_format() {
-    return media_format_;
-  }
-
   // webkit_glue::WebDataSource implementation.
   virtual void Initialize(const std::string& url,
                           media::PipelineStatusCallback* callback);
@@ -125,8 +121,6 @@ class BufferedDataSource : public WebDataSource {
 
   void UpdateHostState();
 
-  media::MediaFormat media_format_;
-
   // URL of the resource requested.
   GURL url_;
 
diff --git a/webkit/glue/media/simple_data_source.cc b/webkit/glue/media/simple_data_source.cc
index 57c51ad..97c4d7a 100644
--- a/webkit/glue/media/simple_data_source.cc
+++ b/webkit/glue/media/simple_data_source.cc
@@ -91,7 +91,7 @@ void SimpleDataSource::Initialize(
     initialize_callback_.reset(callback);
 
     // Validate the URL.
-    SetURL(GURL(url));
+    url_ = GURL(url);
     if (!url_.is_valid() || !IsProtocolSupportedForMedia(url_)) {
       DoneInitialization_Locked(false);
       return;
@@ -114,10 +114,6 @@ void SimpleDataSource::CancelInitialize() {
       NewRunnableMethod(this, &SimpleDataSource::CancelTask));
 }
 
-const media::MediaFormat& SimpleDataSource::media_format() {
-  return media_format_;
-}
-
 void SimpleDataSource::Read(int64 position,
                             size_t size,
                             uint8* data,
@@ -266,12 +262,6 @@ void SimpleDataSource::Abort() {
   frame_ = NULL;
 }
 
-void SimpleDataSource::SetURL(const GURL& url) {
-  url_ = url;
-  media_format_.Clear();
-  media_format_.SetAsString(media::MediaFormat::kURL, url.spec());
-}
-
 void SimpleDataSource::StartTask() {
   DCHECK(MessageLoop::current() == render_loop_);
   // Reference to prevent destruction while inside the |initialize_callback_|
diff --git a/webkit/glue/media/simple_data_source.h b/webkit/glue/media/simple_data_source.h
index 98934d3..721a8bad 100644
--- a/webkit/glue/media/simple_data_source.h
+++ b/webkit/glue/media/simple_data_source.h
@@ -47,7 +47,6 @@ class SimpleDataSource
   virtual void Stop(media::FilterCallback* callback);
 
   // media::DataSource implementation.
-  virtual const media::MediaFormat& media_format();
   virtual void Read(int64 position, size_t size,
                     uint8* data, ReadCallback* read_callback);
   virtual bool GetSize(int64* size_out);
@@ -95,9 +94,6 @@ class SimpleDataSource
   virtual void Abort();
 
  private:
-  // Updates |url_| and |media_format_| with the given URL.
-  void SetURL(const GURL& url);
-
   // Creates and starts the resource loading on the render thread.
   void StartTask();
 
@@ -119,7 +115,6 @@ class SimpleDataSource
   // Does the work of loading and sends data back to this client.
   scoped_ptr<WebKit::WebURLLoader> url_loader_;
 
-  media::MediaFormat media_format_;
   GURL url_;
   std::string data_;
   int64 size_;