| Index: content/public/test/test_file_error_injector.cc
|
| diff --git a/content/public/test/test_file_error_injector.cc b/content/public/test/test_file_error_injector.cc
|
| index 867d1a00d3cff345101ed4bc288c190c9f9a4eb6..b635121876011f0cd3a2cd3a8257e850ddda519d 100644
|
| --- a/content/public/test/test_file_error_injector.cc
|
| +++ b/content/public/test/test_file_error_injector.cc
|
| @@ -42,7 +42,8 @@ class DownloadFileWithError: public DownloadFileImpl {
|
|
|
| ~DownloadFileWithError() override;
|
|
|
| - void Initialize(const InitializeCallback& callback,
|
| + void Initialize(const InitializeCallback& initialize_callback,
|
| + const CancelRequestCallback& cancel_request_callback,
|
| const DownloadItem::ReceivedSlices& received_slices) override;
|
|
|
| // DownloadFile interface.
|
| @@ -133,10 +134,11 @@ DownloadFileWithError::~DownloadFileWithError() {
|
| }
|
|
|
| void DownloadFileWithError::Initialize(
|
| - const InitializeCallback& callback,
|
| + const InitializeCallback& initialize_callback,
|
| + const CancelRequestCallback& cancel_request_callback,
|
| const DownloadItem::ReceivedSlices& received_slices) {
|
| DownloadInterruptReason error_to_return = DOWNLOAD_INTERRUPT_REASON_NONE;
|
| - InitializeCallback callback_to_use = callback;
|
| + InitializeCallback callback_to_use = initialize_callback;
|
|
|
| // Replace callback if the error needs to be overwritten.
|
| if (OverwriteError(
|
| @@ -145,18 +147,18 @@ void DownloadFileWithError::Initialize(
|
| if (DOWNLOAD_INTERRUPT_REASON_NONE != error_to_return) {
|
| // Don't execute a, probably successful, Initialize; just
|
| // return the error.
|
| - BrowserThread::PostTask(
|
| - BrowserThread::UI, FROM_HERE, base::Bind(
|
| - callback, error_to_return));
|
| + BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
|
| + base::Bind(initialize_callback, error_to_return));
|
| return;
|
| }
|
|
|
| // Otherwise, just wrap the return.
|
| - callback_to_use = base::Bind(&InitializeErrorCallback, callback,
|
| + callback_to_use = base::Bind(&InitializeErrorCallback, initialize_callback,
|
| error_to_return);
|
| }
|
|
|
| - DownloadFileImpl::Initialize(callback_to_use, received_slices);
|
| + DownloadFileImpl::Initialize(callback_to_use, cancel_request_callback,
|
| + received_slices);
|
| }
|
|
|
| DownloadInterruptReason DownloadFileWithError::WriteDataToFile(
|
|
|