Fix WebDataRequest ownership gap

chrome/browser/webdata/web_data_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/webdata/web_data_service.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/threading/thread.h"
@@ skipping 404 matching lines @@
   path_ = path;
   is_running_ = true;
 
   ScheduleTask(FROM_HERE,
                Bind(&WebDataService::InitializeDatabaseIfNecessary, this));
   ScheduleTask(FROM_HERE,
                Bind(&WebDataService::InitializeSyncableServices, this));
   return true;
 }
 
-void WebDataService::RequestCompleted(Handle h) {
-  request_manager_.RequestCompleted(h);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 //
 // The following methods are executed in Chrome_WebDataThread.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 void WebDataService::DBInitFailed(sql::InitStatus init_status) {
   ShowProfileErrorDialog(
       (init_status == sql::INIT_FAILURE) ?
       IDS_COULDNT_OPEN_PROFILE_ERROR : IDS_PROFILE_TOO_NEW_ERROR);
@@ skipping 80 matching lines @@
                                   const base::Closure& task) {
   if (is_running_)
     BrowserThread::PostTask(BrowserThread::DB, from_here, task);
   else
     NOTREACHED() << "Task scheduled after Shutdown()";
 }
 
 void WebDataService::ScheduleDBTask(
       const tracked_objects::Location& from_here,
       const base::Closure& task) {
-  WebDataRequest* request =
-      new WebDataRequest(this, NULL, &request_manager_);
+  scoped_ptr<WebDataRequest> request(
+      new WebDataRequest(this, NULL, &request_manager_));
   if (is_running_) {
     BrowserThread::PostTask(BrowserThread::DB, from_here,
-        base::Bind(&WebDataService::DBTaskWrapper, this, task, request));
+        base::Bind(&WebDataService::DBTaskWrapper, this, task,
+                   base::Passed(&request)));
   } else {
     NOTREACHED() << "Task scheduled after Shutdown()";
   }
 }
 
 WebDataService::Handle WebDataService::ScheduleDBTaskWithResult(
       const tracked_objects::Location& from_here,
       const ResultTask& task,
       WebDataServiceConsumer* consumer) {
   DCHECK(consumer);
-  WebDataRequest* request =
-      new WebDataRequest(this, consumer, &request_manager_);
+  scoped_ptr<WebDataRequest> request(
+      new WebDataRequest(this, consumer, &request_manager_));
+  WebDataService::Handle handle = request->GetHandle();
   if (is_running_) {
     BrowserThread::PostTask(BrowserThread::DB, from_here,
-        base::Bind(&WebDataService::DBResultTaskWrapper, this, task, request));
+        base::Bind(&WebDataService::DBResultTaskWrapper, this, task,
+                   base::Passed(&request)));
   } else {
     NOTREACHED() << "Task scheduled after Shutdown()";
   }
-  return request->GetHandle();
+  return handle;
 }
 
 void WebDataService::DBTaskWrapper(const base::Closure& task,
-                                   WebDataRequest* request) {
+                                   scoped_ptr<WebDataRequest> request) {
   InitializeDatabaseIfNecessary();
   if (db_ && !request->IsCancelled()) {
     task.Run();
   }
-  request->RequestComplete();
+  request_manager_.RequestCompleted(request.Pass());
 }
 
 void WebDataService::DBResultTaskWrapper(const ResultTask& task,
-                                         WebDataRequest* request) {
+                                         scoped_ptr<WebDataRequest> request) {
   InitializeDatabaseIfNecessary();
   if (db_ && !request->IsCancelled()) {
     request->SetResult(task.Run().Pass());
   }
-  request->RequestComplete();
+  request_manager_.RequestCompleted(request.Pass());
 }
 
 void WebDataService::ScheduleCommit() {
   if (should_commit_ == false) {
     should_commit_ = true;
     ScheduleTask(FROM_HERE, Bind(&WebDataService::Commit, this));
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 522 matching lines @@
 
 void WebDataService::DestroyAutofillCreditCardResult(
       const WDTypedResult* result) {
   DCHECK(result->GetType() == AUTOFILL_CREDITCARDS_RESULT);
   const WDResult<std::vector<CreditCard*> >* r =
       static_cast<const WDResult<std::vector<CreditCard*> >*>(result);
 
   std::vector<CreditCard*> credit_cards = r->GetValue();
   STLDeleteElements(&credit_cards);
 }