Remove GenericRequest templates from WebDataService

chrome/browser/webdata/web_data_request_manager.cc

 // Copyright 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_request_manager.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "chrome/browser/autofill/autofill_profile.h"
@@ skipping 12 matching lines @@
     : service_(service),
       cancelled_(false),
       consumer_(consumer),
       result_(NULL) {
   handle_ = manager->GetNextRequestHandle();
   message_loop_ = MessageLoop::current();
   manager->RegisterRequest(this);
 }
 
 WebDataRequest::~WebDataRequest() {
-  delete result_;
 }
 
 WebDataService::Handle WebDataRequest::GetHandle() const {
   return handle_;
 }
 
 WebDataServiceConsumer* WebDataRequest::GetConsumer() const {
   return consumer_;
 }
 
 bool WebDataRequest::IsCancelled() const {
   base::AutoLock l(cancel_lock_);
   return cancelled_;
 }
 
 void WebDataRequest::Cancel() {
   base::AutoLock l(cancel_lock_);
   cancelled_ = true;
   consumer_ = NULL;
 }
 
-void WebDataRequest::SetResult(WDTypedResult* r) {
-  result_ = r;
+void WebDataRequest::SetResult(scoped_ptr<WDTypedResult> r) {
+  result_ = r.Pass();
 }
 
 const WDTypedResult* WebDataRequest::GetResult() const {
-  return result_;
+  return result_.get();
 }
 
 void WebDataRequest::RequestComplete() {
   message_loop_->PostTask(FROM_HERE, Bind(&WebDataService::RequestCompleted,
                                           service_.get(), handle_));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // WebDataRequestManager implementation.
@@ skipping 48 matching lines @@
                                           request->GetResult());
   } else {
     // Nobody is taken ownership of the result, either because it is cancelled
     // or there is no consumer. Destroy results that require special handling.
     WDTypedResult const *result = request->GetResult();
     if (result) {
       result->Destroy();
     }
   }
 }