From f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8 Mon Sep 17 00:00:00 2001
From: "willchan@chromium.org"
<willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Sat, 1 Oct 2011 20:38:10 +0000
Subject: Begin CompletionCallback switchover.
Rename CompletionCallback to OldCompletionCallback in preparation for introducing a new CompletionCallback based on base::Callback.
Also renames other CompletionCallback types like CancelableCompletionCallback and TestCompletionCallback and CompletionCallbackImpl. All using sed with s/CompletionCallback/OldCompletionCallback/g.
BUG=98719
TEST=none
Review URL: http://codereview.chromium.org/8070013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103650 0039d316-1c4b-4281-b951-d872f2087c98
---
webkit/fileapi/file_system_url_request_job.h | 2 +-
webkit/fileapi/file_writer_delegate.h | 2 +-
webkit/fileapi/webfilewriter_base_unittest.cc | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
(limited to 'webkit/fileapi')
diff --git a/webkit/fileapi/file_system_url_request_job.h b/webkit/fileapi/file_system_url_request_job.h
index cedabcd..1caa988 100644
--- a/webkit/fileapi/file_system_url_request_job.h
+++ b/webkit/fileapi/file_system_url_request_job.h
@@ -64,7 +64,7 @@ class FileSystemURLRequestJob : public net::URLRequestJob {
scoped_refptr<base::MessageLoopProxy> file_thread_proxy_;
ScopedRunnableMethodFactory<FileSystemURLRequestJob> method_factory_;
base::ScopedCallbackFactory<FileSystemURLRequestJob> callback_factory_;
- net::CompletionCallbackImpl<FileSystemURLRequestJob> io_callback_;
+ net::OldCompletionCallbackImpl<FileSystemURLRequestJob> io_callback_;
scoped_ptr<net::FileStream> stream_;
bool is_directory_;
scoped_ptr<net::HttpResponseInfo> response_info_;
diff --git a/webkit/fileapi/file_writer_delegate.h b/webkit/fileapi/file_writer_delegate.h
index 7f25212..18677fb 100644
--- a/webkit/fileapi/file_writer_delegate.h
+++ b/webkit/fileapi/file_writer_delegate.h
@@ -81,7 +81,7 @@ class FileWriterDelegate : public net::URLRequest::Delegate {
scoped_refptr<net::IOBufferWithSize> io_buffer_;
scoped_ptr<net::FileStream> file_stream_;
net::URLRequest* request_;
- net::CompletionCallbackImpl<FileWriterDelegate> io_callback_;
+ net::OldCompletionCallbackImpl<FileWriterDelegate> io_callback_;
ScopedRunnableMethodFactory<FileWriterDelegate> method_factory_;
base::ScopedCallbackFactory<FileWriterDelegate> callback_factory_;
};
diff --git a/webkit/fileapi/webfilewriter_base_unittest.cc b/webkit/fileapi/webfilewriter_base_unittest.cc
index 43164e7..69ef033 100644
--- a/webkit/fileapi/webfilewriter_base_unittest.cc
+++ b/webkit/fileapi/webfilewriter_base_unittest.cc
@@ -385,7 +385,7 @@ TEST_F(FileWriterTest, CancelFailedTruncate) {
EXPECT_EQ(0, received_did_write_count_);
}
-TEST_F(FileWriterTest, DeleteInCompletionCallbacks) {
+TEST_F(FileWriterTest, DeleteInOldCompletionCallbacks) {
delete_in_client_callback_ = true;
writer()->write(kBasicFileWrite_Offset, GURL("blob://bloburl/"));
EXPECT_FALSE(testable_writer_.get());
--
cgit v1.1