Revert 65272 - Autofill heapcheck and valgrind leak in PersonalDataManager un...

chrome/browser/webdata/web_data_service.cc

 // Copyright (c) 2010 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/message_loop.h"
 #include "base/stl_util-inl.h"
 #include "base/task.h"
 #include "base/thread.h"
@@ skipping 1021 matching lines @@
     const AutoFillProfile& profile = request->GetArgument();
 
     // TODO(dhollowa): Remove labels.  http://crbug.com/58813
     // Send out old Label-based notification until sync can switch over to
     // GUID-based notifications.
     // Only perform the update if the profile exists.  It is currently
     // valid to try to update a missing profile.  We simply drop the write and
     // the caller will detect this on the next refresh.
     AutoFillProfile* original_profile = NULL;
     if (!db_->GetAutoFillProfileForGUID(profile.guid(), &original_profile)) {
-      request->RequestComplete();
       return;
     }
     scoped_ptr<AutoFillProfile> scoped_profile(original_profile);
 
     if (!db_->UpdateAutoFillProfile(profile)) {
       NOTREACHED();
       return;
     }
     ScheduleCommit();
 
@@ skipping 98 matching lines @@
 void WebDataService::UpdateCreditCardGUIDImpl(
     GenericRequest<CreditCard>* request) {
   InitializeDatabaseIfNecessary();
   if (db_ && !request->IsCancelled()) {
     const CreditCard& credit_card = request->GetArgument();
 
     // It is currently valid to try to update a missing profile.  We simply drop
     // the write and the caller will detect this on the next refresh.
     CreditCard* original_credit_card = NULL;
     if (!db_->GetCreditCardForGUID(credit_card.guid(), &original_credit_card)) {
-      request->RequestComplete();
       return;
     }
     scoped_ptr<CreditCard> scoped_credit_card(original_credit_card);
 
     if (!db_->UpdateCreditCard(credit_card)) {
       NOTREACHED();
       return;
     }
     ScheduleCommit();
 
@@ skipping 103 matching lines @@
   return result_;
 }
 
 void WebDataService::WebDataRequest::RequestComplete() {
   WebDataService* s = service_;
   Task* t = NewRunnableMethod(s,
                               &WebDataService::RequestCompleted,
                               handle_);
   message_loop_->PostTask(FROM_HERE, t);
 }