From 6981d96328621a75557dbf843c5aab83bf4f55a3 Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Tue, 30 Nov 2010 21:34:02 +0000 Subject: net: Remove typedef net::URLRequest URLRequest; BUG=64263 TEST=compiled locally, trybots Review URL: http://codereview.chromium.org/5384002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67762 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/blob/blob_storage_controller.cc | 2 +- webkit/blob/blob_url_request_job.cc | 2 +- webkit/blob/blob_url_request_job_unittest.cc | 22 +++++++++++----------- webkit/blob/view_blob_internals_job.cc | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'webkit/blob') diff --git a/webkit/blob/blob_storage_controller.cc b/webkit/blob/blob_storage_controller.cc index de70774..41583af 100644 --- a/webkit/blob/blob_storage_controller.cc +++ b/webkit/blob/blob_storage_controller.cc @@ -129,7 +129,7 @@ void BlobStorageController::ResolveBlobReferencesInUploadData( break; case webkit_blob::BlobData::TYPE_FILE: // TODO(michaeln): Ensure that any temp files survive till the - // URLRequest is done with the upload. + // net::URLRequest is done with the upload. iter->SetToFilePathRange( item.file_path(), item.offset(), diff --git a/webkit/blob/blob_url_request_job.cc b/webkit/blob/blob_url_request_job.cc index 41165e5..6b62605 100644 --- a/webkit/blob/blob_url_request_job.cc +++ b/webkit/blob/blob_url_request_job.cc @@ -40,7 +40,7 @@ static const char* kHTTPRequestedRangeNotSatisfiableText = static const char* kHTTPInternalErrorText = "Internal Server Error"; BlobURLRequestJob::BlobURLRequestJob( - URLRequest* request, + net::URLRequest* request, BlobData* blob_data, base::MessageLoopProxy* file_thread_proxy) : URLRequestJob(request), diff --git a/webkit/blob/blob_url_request_job_unittest.cc b/webkit/blob/blob_url_request_job_unittest.cc index 2fb2337..65b1e91 100644 --- a/webkit/blob/blob_url_request_job_unittest.cc +++ b/webkit/blob/blob_url_request_job_unittest.cc @@ -41,14 +41,14 @@ class BlobURLRequestJobTest : public testing::Test { // Test Harness ------------------------------------------------------------- // TODO(jianli): share this test harness with AppCacheURLRequestJobTest - class MockURLRequestDelegate : public URLRequest::Delegate { + class MockURLRequestDelegate : public net::URLRequest::Delegate { public: explicit MockURLRequestDelegate(BlobURLRequestJobTest* test) : test_(test), received_data_(new net::IOBuffer(kBufferSize)) { } - virtual void OnResponseStarted(URLRequest* request) { + virtual void OnResponseStarted(net::URLRequest* request) { if (request->status().is_success()) { EXPECT_TRUE(request->response_headers()); ReadSome(request); @@ -57,7 +57,7 @@ class BlobURLRequestJobTest : public testing::Test { } } - virtual void OnReadCompleted(URLRequest* request, int bytes_read) { + virtual void OnReadCompleted(net::URLRequest* request, int bytes_read) { if (bytes_read > 0) ReceiveData(request, bytes_read); else @@ -67,7 +67,7 @@ class BlobURLRequestJobTest : public testing::Test { const std::string& response_data() const { return response_data_; } private: - void ReadSome(URLRequest* request) { + void ReadSome(net::URLRequest* request) { if (request->job()->is_done()) { RequestComplete(); return; @@ -84,7 +84,7 @@ class BlobURLRequestJobTest : public testing::Test { ReceiveData(request, bytes_read); } - void ReceiveData(URLRequest* request, int bytes_read) { + void ReceiveData(net::URLRequest* request, int bytes_read) { if (bytes_read) { response_data_.append(received_data_->data(), static_cast(bytes_read)); @@ -150,7 +150,7 @@ class BlobURLRequestJobTest : public testing::Test { io_thread_.reset(NULL); } - static URLRequestJob* BlobURLRequestJobFactory(URLRequest* request, + static URLRequestJob* BlobURLRequestJobFactory(net::URLRequest* request, const std::string& scheme) { BlobURLRequestJob* temp = blob_url_request_job_; blob_url_request_job_ = NULL; @@ -172,7 +172,7 @@ class BlobURLRequestJobTest : public testing::Test { void SetUpTest() { DCHECK(MessageLoop::current() == io_thread_->message_loop()); - URLRequest::RegisterProtocolFactory("blob", &BlobURLRequestJobFactory); + net::URLRequest::RegisterProtocolFactory("blob", &BlobURLRequestJobFactory); url_request_delegate_.reset(new MockURLRequestDelegate(this)); } @@ -183,7 +183,7 @@ class BlobURLRequestJobTest : public testing::Test { url_request_delegate_.reset(); DCHECK(!blob_url_request_job_); - URLRequest::RegisterProtocolFactory("blob", NULL); + net::URLRequest::RegisterProtocolFactory("blob", NULL); } void TestFinished() { @@ -245,8 +245,8 @@ class BlobURLRequestJobTest : public testing::Test { const net::HttpRequestHeaders& extra_headers, BlobData* blob_data) { // This test has async steps. - request_.reset(new URLRequest(GURL("blob:blah"), - url_request_delegate_.get())); + request_.reset(new net::URLRequest(GURL("blob:blah"), + url_request_delegate_.get())); request_->set_method(method); blob_url_request_job_ = new BlobURLRequestJob(request_.get(), blob_data, NULL); @@ -391,7 +391,7 @@ class BlobURLRequestJobTest : public testing::Test { scoped_ptr test_finished_event_; std::stack > task_stack_; - scoped_ptr request_; + scoped_ptr request_; scoped_ptr url_request_delegate_; int expected_status_code_; std::string expected_response_; diff --git a/webkit/blob/view_blob_internals_job.cc b/webkit/blob/view_blob_internals_job.cc index 00c3eb3..6d6955b 100644 --- a/webkit/blob/view_blob_internals_job.cc +++ b/webkit/blob/view_blob_internals_job.cc @@ -100,7 +100,7 @@ void AddHTMLButton(const std::string& title, namespace webkit_blob { ViewBlobInternalsJob::ViewBlobInternalsJob( - URLRequest* request, BlobStorageController* blob_storage_controller) + net::URLRequest* request, BlobStorageController* blob_storage_controller) : URLRequestSimpleJob(request), blob_storage_controller_(blob_storage_controller) { } -- cgit v1.1