Remove unnecessary use of SupportsWeakPtr in content/browser/renderer_host
Most of them are replaced with WeakPtrFactory to avoid exposing AsWeakPtr()
BUG=None
TEST=build success
Review URL: https://chromiumcodereview.appspot.com/10824061
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149375 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/content/browser/renderer_host/resource_loader.cc b/content/browser/renderer_host/resource_loader.cc
index 93ff03a..e928724 100644
--- a/content/browser/renderer_host/resource_loader.cc
+++ b/content/browser/renderer_host/resource_loader.cc
@@ -59,7 +59,8 @@
delegate_(delegate),
last_upload_position_(0),
waiting_for_upload_progress_ack_(false),
- is_transferring_(false) {
+ is_transferring_(false),
+ weak_ptr_factory_(this) {
request_->set_delegate(this);
handler_->SetController(this);
}
@@ -276,7 +277,7 @@
NOTREACHED();
SSLManager::OnSSLCertificateError(
- AsWeakPtr(),
+ weak_ptr_factory_.GetWeakPtr(),
info->GetGlobalRequestID(),
info->GetResourceType(),
request_->url(),
@@ -381,13 +382,15 @@
case DEFERRED_READ:
MessageLoop::current()->PostTask(
FROM_HERE,
- base::Bind(&ResourceLoader::ResumeReading, AsWeakPtr()));
+ base::Bind(&ResourceLoader::ResumeReading,
+ weak_ptr_factory_.GetWeakPtr()));
break;
case DEFERRED_FINISH:
// Delay self-destruction since we don't know how we were reached.
MessageLoop::current()->PostTask(
FROM_HERE,
- base::Bind(&ResourceLoader::CallDidFinishLoading, AsWeakPtr()));
+ base::Bind(&ResourceLoader::CallDidFinishLoading,
+ weak_ptr_factory_.GetWeakPtr()));
break;
}
}
@@ -434,7 +437,8 @@
// notification from the request, so we have to signal ourselves to finish
// this request.
MessageLoop::current()->PostTask(
- FROM_HERE, base::Bind(&ResourceLoader::ResponseCompleted, AsWeakPtr()));
+ FROM_HERE, base::Bind(&ResourceLoader::ResponseCompleted,
+ weak_ptr_factory_.GetWeakPtr()));
}
}
@@ -485,7 +489,8 @@
// thread in case the URLRequest can provide data synchronously.
MessageLoop::current()->PostTask(
FROM_HERE,
- base::Bind(&ResourceLoader::OnReadCompleted, AsWeakPtr(),
+ base::Bind(&ResourceLoader::OnReadCompleted,
+ weak_ptr_factory_.GetWeakPtr(),
request_.get(), bytes_read));
}
}