Remove MediaFormat once and for all.

webkit/glue/media/simple_data_source.cc

 // Copyright (c) 2011 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.
 
 #include "webkit/glue/media/simple_data_source.h"
 
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "media/base/filter_host.h"
 #include "net/base/data_url.h"
@@ skipping 73 matching lines @@
   // lock and running the destructor.
   scoped_refptr<SimpleDataSource> destruction_guard(this);
   {
     base::AutoLock auto_lock(lock_);
     DCHECK_EQ(state_, UNINITIALIZED);
     DCHECK(callback);
     state_ = INITIALIZING;
     initialize_callback_.reset(callback);
 
     // Validate the URL.
-    SetURL(GURL(url));
+    url_ = GURL(url);
     if (!url_.is_valid() || !IsProtocolSupportedForMedia(url_)) {
       DoneInitialization_Locked(false);
       return;
     }
 
     // Post a task to the render thread to start loading the resource.
     render_loop_->PostTask(FROM_HERE,
         NewRunnableMethod(this, &SimpleDataSource::StartTask));
   }
 }
 
 void SimpleDataSource::CancelInitialize() {
   base::AutoLock auto_lock(lock_);
   DCHECK(initialize_callback_.get());
   state_ = STOPPED;
   initialize_callback_.reset();
 
   // Post a task to the render thread to cancel loading the resource.
   render_loop_->PostTask(FROM_HERE,
       NewRunnableMethod(this, &SimpleDataSource::CancelTask));
 }
 
-const media::MediaFormat& SimpleDataSource::media_format() {
-  return media_format_;
-}
-
 void SimpleDataSource::Read(int64 position,
                             size_t size,
                             uint8* data,
                             ReadCallback* read_callback) {
   DCHECK_GE(size_, 0);
   if (position >= size_) {
     read_callback->RunWithParams(Tuple1<size_t>(0));
     delete read_callback;
   } else {
     size_t copied = std::min(size, static_cast<size_t>(size_ - position));
@@ skipping 128 matching lines @@
 bool SimpleDataSource::HasSingleOrigin() {
   DCHECK(MessageLoop::current() == render_loop_);
   return single_origin_;
 }
 
 void SimpleDataSource::Abort() {
   DCHECK(MessageLoop::current() == render_loop_);
   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_|
   // call. This is a temporary fix to prevent crashes caused by holding the
   // lock and running the destructor.
   scoped_refptr<SimpleDataSource> destruction_guard(this);
   {
     base::AutoLock auto_lock(lock_);
 
     // We may have stopped.
@@ skipping 67 matching lines @@
 void SimpleDataSource::UpdateHostState() {
   if (host()) {
     host()->SetTotalBytes(size_);
     host()->SetBufferedBytes(size_);
     // If scheme is file or data, say we are loaded.
     host()->SetLoaded(url_.SchemeIsFile() || url_.SchemeIs(kDataScheme));
   }
 }
 
 }  // namespace webkit_glue