Remove implicit conversions from scoped_refptr to T* in components/

components/webdata/common/web_database_service.cc

Index: components/webdata/common/web_database_service.cc
diff --git a/components/webdata/common/web_database_service.cc b/components/webdata/common/web_database_service.cc
index 61846d169e3f1ac3ccb537f72ff4c499c72dd327..101c7de3a956de5f979bcc6c4a6e585fcc5827f8 100644
--- a/components/webdata/common/web_database_service.cc
+++ b/components/webdata/common/web_database_service.cc
@@ -56,7 +56,7 @@ WebDatabaseService::~WebDatabaseService() {
 }
 
 void WebDatabaseService::AddTable(scoped_ptr<WebDatabaseTable> table) {
-  if (!wds_backend_) {
+  if (!wds_backend_.get()) {
     wds_backend_ = new WebDataServiceBackend(
         path_, new BackendDelegate(weak_ptr_factory_.GetWeakPtr()),
         db_thread_);
@@ -65,7 +65,7 @@ void WebDatabaseService::AddTable(scoped_ptr<WebDatabaseTable> table) {
 }
 
 void WebDatabaseService::LoadDatabase() {
-  DCHECK(wds_backend_);
+  DCHECK(wds_backend_.get());
   db_thread_->PostTask(
       FROM_HERE,
       Bind(&WebDataServiceBackend::InitDatabase, wds_backend_));

[Cait (Slow), 2014/08/26 18:01:35]

Do scoped_refptr's in Bind() calls need to be made explicit as well?

If so, base::Bind examples
(https://code.google.com/p/chromium/codesearch#chromium/src/base/callback.h&l=70)
should probably be updated too.

[dcheng, 2014/08/26 18:09:38]

It depends on how it's being bound. In that particular exampe, it's OK--when
used as the object pointer, base::Bind() automatically saves a scoped_refptr
internally (if it's a ref counted class).

If passed as a parameter, then it depends on the callback definition--but in
that case, the tool will rewrite any parameters that need to be explicitly
converted with .get().

@@ -76,7 +76,7 @@ void WebDatabaseService::ShutdownDatabase() {
   loaded_callbacks_.clear();
   error_callbacks_.clear();
   weak_ptr_factory_.InvalidateWeakPtrs();
-  if (!wds_backend_)
+  if (!wds_backend_.get())
     return;
   db_thread_->PostTask(
       FROM_HERE, Bind(&WebDataServiceBackend::ShutdownDatabase, wds_backend_));
@@ -84,7 +84,7 @@ void WebDatabaseService::ShutdownDatabase() {
 
 WebDatabase* WebDatabaseService::GetDatabaseOnDB() const {
   DCHECK(db_thread_->BelongsToCurrentThread());
-  return wds_backend_ ? wds_backend_->database() : NULL;
+  return wds_backend_.get() ? wds_backend_->database() : NULL;
 }
 
 scoped_refptr<WebDataServiceBackend> WebDatabaseService::GetBackend() const {
@@ -94,7 +94,7 @@ scoped_refptr<WebDataServiceBackend> WebDatabaseService::GetBackend() const {
 void WebDatabaseService::ScheduleDBTask(
     const tracked_objects::Location& from_here,
     const WriteTask& task) {
-  DCHECK(wds_backend_);
+  DCHECK(wds_backend_.get());
   scoped_ptr<WebDataRequest> request(
       new WebDataRequest(NULL, wds_backend_->request_manager().get()));
   db_thread_->PostTask(from_here,
@@ -107,7 +107,7 @@ WebDataServiceBase::Handle WebDatabaseService::ScheduleDBTaskWithResult(
     const ReadTask& task,
     WebDataServiceConsumer* consumer) {
   DCHECK(consumer);
-  DCHECK(wds_backend_);
+  DCHECK(wds_backend_.get());
   scoped_ptr<WebDataRequest> request(
       new WebDataRequest(consumer, wds_backend_->request_manager().get()));
   WebDataServiceBase::Handle handle = request->GetHandle();
@@ -118,7 +118,7 @@ WebDataServiceBase::Handle WebDatabaseService::ScheduleDBTaskWithResult(
 }
 
 void WebDatabaseService::CancelRequest(WebDataServiceBase::Handle h) {
-  if (!wds_backend_)
+  if (!wds_backend_.get())
     return;
   wds_backend_->request_manager()->CancelRequest(h);
 }