Index: webkit/media/buffered_resource_loader.h |
diff --git a/webkit/media/buffered_resource_loader.h b/webkit/media/buffered_resource_loader.h |
index 4399d00a77075bb1ea267624a82dbcc575458bd3..4141c7935cc2c85d4ccdfc4eaf95653cc0416e6d 100644 |
--- a/webkit/media/buffered_resource_loader.h |
+++ b/webkit/media/buffered_resource_loader.h |
@@ -79,7 +79,7 @@ class BufferedResourceLoader |
// An error code that indicates the request has failed. |
// |event_callback| is called when the response is completed, data is |
// received, the request is suspended or resumed. |
- virtual void Start(net::OldCompletionCallback* callback, |
+ virtual void Start(const net::CompletionCallback& callback, |
const base::Closure& event_callback, |
WebKit::WebFrame* frame); |
@@ -98,7 +98,7 @@ class BufferedResourceLoader |
// - net::ERR_CACHE_MISS |
// The read was made too far away from the current buffered position. |
virtual void Read(int64 position, int read_size, |
- uint8* buffer, net::OldCompletionCallback* callback); |
+ uint8* buffer, const net::CompletionCallback& callback); |
// Returns the position of the last byte buffered. Returns |
// |kPositionNotSpecified| if such value is not available. |
@@ -227,7 +227,7 @@ class BufferedResourceLoader |
// Calls |event_callback_| in terms of a network event. |
void NotifyNetworkEvent(); |
- bool HasPendingRead() { return read_callback_.get() != NULL; } |
+ bool HasPendingRead() { return !read_callback_.is_null(); } |
// Helper function that returns true if a range request was specified. |
bool IsRangeRequest() const; |
@@ -268,14 +268,14 @@ class BufferedResourceLoader |
base::Closure event_callback_; |
// Members used during request start. |
- scoped_ptr<net::OldCompletionCallback> start_callback_; |
+ net::CompletionCallback start_callback_; |
int64 offset_; |
int64 content_length_; |
int64 instance_size_; |
// Members used during a read operation. They should be reset after each |
// read has completed or failed. |
- scoped_ptr<net::OldCompletionCallback> read_callback_; |
+ net::CompletionCallback read_callback_; |
int64 read_position_; |
size_t read_size_; |
uint8* read_buffer_; |