| Index: webkit/glue/media/buffered_data_source.h
|
| diff --git a/webkit/glue/media/buffered_data_source.h b/webkit/glue/media/buffered_data_source.h
|
| index 408d095ee340e203baf57e2f4dec3c9324cf9361..c0d9110acf2b14ca638dcf7d16931276d073c691 100644
|
| --- a/webkit/glue/media/buffered_data_source.h
|
| +++ b/webkit/glue/media/buffered_data_source.h
|
| @@ -45,7 +45,7 @@ class BufferedDataSource : public WebDataSource {
|
|
|
| // webkit_glue::WebDataSource implementation.
|
| virtual void Initialize(const std::string& url,
|
| - media::PipelineStatusCallback* callback);
|
| + const media::PipelineStatusCB& callback);
|
| virtual void CancelInitialize();
|
| virtual bool HasSingleOrigin();
|
| virtual void Abort();
|
| @@ -92,7 +92,7 @@ class BufferedDataSource : public WebDataSource {
|
| // Calls |read_callback_| and reset all read parameters.
|
| void DoneRead_Locked(int error);
|
|
|
| - // Calls |initialize_callback_| and reset it.
|
| + // Calls |initialize_cb_| and reset it.
|
| void DoneInitialization_Locked(media::PipelineStatus status);
|
|
|
| // Callback method for |loader_| if URL for the resource requested is using
|
| @@ -148,7 +148,7 @@ class BufferedDataSource : public WebDataSource {
|
| bool network_activity_;
|
|
|
| // Callback method from the pipeline for initialization.
|
| - scoped_ptr<media::PipelineStatusCallback> initialize_callback_;
|
| + media::PipelineStatusCB initialize_cb_;
|
|
|
| // Read parameters received from the Read() method call.
|
| scoped_ptr<media::DataSource::ReadCallback> read_callback_;
|
|
|