| Index: webkit/glue/media/simple_data_source.cc
|
| diff --git a/webkit/glue/media/simple_data_source.cc b/webkit/glue/media/simple_data_source.cc
|
| index 57c51ad87e1a1354b7774d8e6ff4fd97e632a1d2..97c4d7a5da3e39a58c633ec00d3ba5c89b105b70 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_|
|
|
|