Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(780)

Unified Diff: net/url_request/url_fetcher_core.cc

Issue 11275088: Remove implicit scoped_refptr operator T* Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/tools/net_watcher/net_watcher.cc ('k') | net/url_request/url_fetcher_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/url_request/url_fetcher_core.cc
diff --git a/net/url_request/url_fetcher_core.cc b/net/url_request/url_fetcher_core.cc
index a9b91eb5c774008fd9705c1410e9438c9dbc6b06..f22d54d9e75651e75d0fdb5be1fdf6994eab0fdd 100644
--- a/net/url_request/url_fetcher_core.cc
+++ b/net/url_request/url_fetcher_core.cc
@@ -73,7 +73,7 @@ void URLFetcherCore::FileWriter::CreateFileAtPath(
DCHECK(core_->network_task_runner_->BelongsToCurrentThread());
DCHECK(file_task_runner_.get());
base::FileUtilProxy::CreateOrOpen(
- file_task_runner_,
+ file_task_runner_.get(),
file_path,
base::PLATFORM_FILE_CREATE_ALWAYS | base::PLATFORM_FILE_WRITE,
base::Bind(&URLFetcherCore::FileWriter::DidCreateFile,
@@ -85,7 +85,7 @@ void URLFetcherCore::FileWriter::CreateTempFile() {
DCHECK(core_->network_task_runner_->BelongsToCurrentThread());
DCHECK(file_task_runner_.get());
base::FileUtilProxy::CreateTemporary(
- file_task_runner_,
+ file_task_runner_.get(),
0, // No additional file flags.
base::Bind(&URLFetcherCore::FileWriter::DidCreateTempFile,
weak_factory_.GetWeakPtr()));
@@ -137,7 +137,7 @@ void URLFetcherCore::FileWriter::ContinueWrite(
if (pending_bytes_ > 0) {
base::FileUtilProxy::Write(
- file_task_runner_, file_handle_,
+ file_task_runner_.get(), file_handle_,
total_bytes_written_, // Append to the end
(core_->buffer_->data() + buffer_offset_), pending_bytes_,
base::Bind(&URLFetcherCore::FileWriter::ContinueWrite,
@@ -164,7 +164,7 @@ void URLFetcherCore::FileWriter::CloseFileAndCompleteRequest() {
if (file_handle_ != base::kInvalidPlatformFileValue) {
base::FileUtilProxy::Close(
- file_task_runner_, file_handle_,
+ file_task_runner_.get(), file_handle_,
base::Bind(&URLFetcherCore::FileWriter::DidCloseFile,
weak_factory_.GetWeakPtr()));
file_handle_ = base::kInvalidPlatformFileValue;
@@ -180,7 +180,7 @@ void URLFetcherCore::FileWriter::CloseAndDeleteFile() {
}
// Close the file if it is open.
base::FileUtilProxy::Close(
- file_task_runner_, file_handle_,
+ file_task_runner_.get(), file_handle_,
base::Bind(&URLFetcherCore::FileWriter::DeleteFile,
weak_factory_.GetWeakPtr()));
file_handle_ = base::kInvalidPlatformFileValue;
@@ -193,7 +193,7 @@ void URLFetcherCore::FileWriter::DeleteFile(
return;
base::FileUtilProxy::Delete(
- file_task_runner_, file_path_,
+ file_task_runner_.get(), file_path_,
false, // No need to recurse, as the path is to a file.
base::FileUtilProxy::StatusCallback());
DisownFile();
@@ -295,7 +295,7 @@ URLFetcherCore::URLFetcherCore(URLFetcher* fetcher,
void URLFetcherCore::Start() {
DCHECK(delegate_task_runner_);
DCHECK(request_context_getter_) << "We need an URLRequestContext!";
- if (network_task_runner_) {
+ if (network_task_runner_.get()) {
DCHECK_EQ(network_task_runner_,
request_context_getter_->GetNetworkTaskRunner());
} else {
@@ -308,7 +308,7 @@ void URLFetcherCore::Start() {
}
void URLFetcherCore::Stop() {
- if (delegate_task_runner_) // May be NULL in tests.
+ if (delegate_task_runner_.get()) // May be NULL in tests.
DCHECK(delegate_task_runner_->BelongsToCurrentThread());
delegate_ = NULL;
@@ -378,7 +378,7 @@ void URLFetcherCore::GetExtraRequestHeaders(
void URLFetcherCore::SetRequestContext(
URLRequestContextGetter* request_context_getter) {
- DCHECK(!request_context_getter_);
+ DCHECK(!request_context_getter_.get());
DCHECK(request_context_getter);
request_context_getter_ = request_context_getter;
}
@@ -435,7 +435,7 @@ void URLFetcherCore::SaveResponseToTemporaryFile(
}
HttpResponseHeaders* URLFetcherCore::GetResponseHeaders() const {
- return response_headers_;
+ return response_headers_.get();
}
// TODO(panayiotis): socket_address_ is written in the IO thread,
@@ -580,7 +580,7 @@ void URLFetcherCore::OnReadCompleted(URLRequest* request,
waiting_on_write = true;
break;
}
- } while (request_->Read(buffer_, kBufferSize, &bytes_read));
+ } while (request_->Read(buffer_.get(), kBufferSize, &bytes_read));
const URLRequestStatus status = request_->status();
@@ -752,7 +752,7 @@ void URLFetcherCore::StartURLRequestWhenAppropriate() {
DCHECK(request_context_getter_);
int64 delay = 0LL;
- if (original_url_throttler_entry_ == NULL) {
+ if (original_url_throttler_entry_.get() == NULL) {
URLRequestThrottlerManager* manager =
request_context_getter_->GetURLRequestContext()->throttler_manager();
if (manager) {
@@ -760,7 +760,7 @@ void URLFetcherCore::StartURLRequestWhenAppropriate() {
manager->RegisterRequestUrl(original_url_);
}
}
- if (original_url_throttler_entry_ != NULL) {
+ if (original_url_throttler_entry_.get() != NULL) {
delay = original_url_throttler_entry_->ReserveSendingTimeForNextRequest(
GetBackoffReleaseTime());
}
@@ -812,7 +812,7 @@ void URLFetcherCore::InformDelegateFetchIsComplete() {
void URLFetcherCore::NotifyMalformedContent() {
DCHECK(network_task_runner_->BelongsToCurrentThread());
- if (url_throttler_entry_ != NULL) {
+ if (url_throttler_entry_.get() != NULL) {
int status_code = response_code_;
if (status_code == URLFetcher::RESPONSE_CODE_INVALID) {
// The status code will generally be known by the time clients
@@ -876,12 +876,12 @@ void URLFetcherCore::ReleaseRequest() {
base::TimeTicks URLFetcherCore::GetBackoffReleaseTime() {
DCHECK(network_task_runner_->BelongsToCurrentThread());
- if (original_url_throttler_entry_) {
+ if (original_url_throttler_entry_.get()) {
base::TimeTicks original_url_backoff =
original_url_throttler_entry_->GetExponentialBackoffReleaseTime();
base::TimeTicks destination_url_backoff;
- if (url_throttler_entry_ != NULL &&
- original_url_throttler_entry_ != url_throttler_entry_) {
+ if (url_throttler_entry_.get() != NULL &&
+ original_url_throttler_entry_.get() != url_throttler_entry_.get()) {
destination_url_backoff =
url_throttler_entry_->GetExponentialBackoffReleaseTime();
}
@@ -941,7 +941,7 @@ void URLFetcherCore::ReadResponse() {
int bytes_read = 0;
if (request_->status().is_success() &&
(request_type_ != URLFetcher::HEAD))
- request_->Read(buffer_, kBufferSize, &bytes_read);
+ request_->Read(buffer_.get(), kBufferSize, &bytes_read);
OnReadCompleted(request_.get(), bytes_read);
}
« no previous file with comments | « net/tools/net_watcher/net_watcher.cc ('k') | net/url_request/url_fetcher_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698