diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-11 10:18:59 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-11 10:18:59 +0000 |
| commit | 9acd869ec5621373757a6959310f39e1f5ec3f3d (patch) | |
| tree | 43b9beab430d066670b7515579e20c755d9a0d4d /webkit/blob | |
| parent | 3f45597ed0041c49a627fd5e2be55ff6d5570022 (diff) | |
| download | chromium_src-9acd869ec5621373757a6959310f39e1f5ec3f3d.zip chromium_src-9acd869ec5621373757a6959310f39e1f5ec3f3d.tar.gz chromium_src-9acd869ec5621373757a6959310f39e1f5ec3f3d.tar.bz2 | |
net: Remove typedef net::URLRequestJob URLRequestJob;
BUG=64263
TEST=compiled locally, trybots
Review URL: http://codereview.chromium.org/5607004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68935 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/blob')
| -rw-r--r-- | webkit/blob/blob_url_request_job.cc | 4 | ||||
| -rw-r--r-- | webkit/blob/blob_url_request_job.h | 2 | ||||
| -rw-r--r-- | webkit/blob/blob_url_request_job_unittest.cc | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/webkit/blob/blob_url_request_job.cc b/webkit/blob/blob_url_request_job.cc index bbe26be..4fb5611 100644 --- a/webkit/blob/blob_url_request_job.cc +++ b/webkit/blob/blob_url_request_job.cc @@ -44,7 +44,7 @@ BlobURLRequestJob::BlobURLRequestJob( net::URLRequest* request, BlobData* blob_data, base::MessageLoopProxy* file_thread_proxy) - : URLRequestJob(request), + : net::URLRequestJob(request), callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), blob_data_(blob_data), file_thread_proxy_(file_thread_proxy), @@ -92,7 +92,7 @@ void BlobURLRequestJob::DidStart() { void BlobURLRequestJob::Kill() { stream_.Close(); - URLRequestJob::Kill(); + net::URLRequestJob::Kill(); callback_factory_.RevokeAll(); method_factory_.RevokeAll(); } diff --git a/webkit/blob/blob_url_request_job.h b/webkit/blob/blob_url_request_job.h index c82ebfc..2dec522 100644 --- a/webkit/blob/blob_url_request_job.h +++ b/webkit/blob/blob_url_request_job.h @@ -31,7 +31,7 @@ class BlobURLRequestJob : public net::URLRequestJob { base::MessageLoopProxy* resolving_message_loop_proxy); virtual ~BlobURLRequestJob(); - // URLRequestJob methods. + // net::URLRequestJob methods. virtual void Start(); virtual void Kill(); virtual bool ReadRawData(net::IOBuffer* buf, int buf_size, int* bytes_read); diff --git a/webkit/blob/blob_url_request_job_unittest.cc b/webkit/blob/blob_url_request_job_unittest.cc index 65b1e91..a81f378 100644 --- a/webkit/blob/blob_url_request_job_unittest.cc +++ b/webkit/blob/blob_url_request_job_unittest.cc @@ -150,8 +150,9 @@ class BlobURLRequestJobTest : public testing::Test { io_thread_.reset(NULL); } - static URLRequestJob* BlobURLRequestJobFactory(net::URLRequest* request, - const std::string& scheme) { + static net::URLRequestJob* BlobURLRequestJobFactory( + net::URLRequest* request, + const std::string& scheme) { BlobURLRequestJob* temp = blob_url_request_job_; blob_url_request_job_ = NULL; return temp; |