Remove stl_util's STLDeleteContainerPointers from autofill.

android_webview/browser/aw_form_database_service.cc

 // Copyright (c) 2013 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 "android_webview/browser/aw_form_database_service.h"
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "components/autofill/core/browser/webdata/autofill_table.h"
@@ skipping 88 matching lines @@
       autofill_data_->GetCountOfValuesContainedBetween(
           base::Time(), base::Time::Max(), this);
   PendingQuery query;
   query.result = result;
   query.completion = completion;
   result_map_[pending_query_handle] = query;
 }
 
 void AwFormDatabaseService::OnWebDataServiceRequestDone(
     WebDataServiceBase::Handle h,
-    const WDTypedResult* result) {
-
+    std::unique_ptr<WDTypedResult> result) {
   DCHECK_CURRENTLY_ON(BrowserThread::DB);
   bool has_form_data = false;
   if (result) {
     DCHECK_EQ(AUTOFILL_VALUE_RESULT, result->GetType());
     const WDResult<int>* autofill_result =
-        static_cast<const WDResult<int>*>(result);
+        static_cast<const WDResult<int>*>(result.get());
     has_form_data = autofill_result->GetValue() > 0;
   }
   QueryMap::const_iterator it = result_map_.find(h);
   if (it == result_map_.end()) {
     LOG(WARNING) << "Received unexpected callback from web data service";
     return;
   }
   *(it->second.result) = has_form_data;
   it->second.completion->Signal();
   result_map_.erase(h);
 }
 
 }  // namespace android_webview