Remove stl_util's STLDeleteContainerPointers from autofill.

chrome/browser/password_manager/password_store_win.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/password_manager/password_store_win.h"
 
 #include <stddef.h>
 
 #include <map>
 #include <memory>
@@ skipping 52 matching lines @@
 
   // Gets logins from IE7 if no others are found. Also copies them into
   // Chrome's WebDatabase so we don't need to look next time.
   std::vector<std::unique_ptr<PasswordForm>> GetIE7Results(
       const WDTypedResult* result,
       const PasswordStore::FormDigest& form);
 
   // WebDataServiceConsumer implementation.
   void OnWebDataServiceRequestDone(
       PasswordWebDataService::Handle handle,
-      const WDTypedResult* result) override;
+      std::unique_ptr<WDTypedResult> result) override;
 
   scoped_refptr<PasswordWebDataService> web_data_service_;
 
   // This creates a cycle between us and PasswordStore. The cycle is broken
   // from PasswordStoreWin::ShutdownOnUIThread, which deletes us.
   scoped_refptr<PasswordStoreWin> password_store_;
 
   PendingRequestMap pending_requests_;
 
   DISALLOW_COPY_AND_ASSIGN(DBHandler);
@@ skipping 55 matching lines @@
         password_store_->AddLoginImpl(*matched_form);
         matched_forms.push_back(std::move(matched_form));
       }
     }
   }
   return matched_forms;
 }
 
 void PasswordStoreWin::DBHandler::OnWebDataServiceRequestDone(
     PasswordWebDataService::Handle handle,
-    const WDTypedResult* result) {
+    std::unique_ptr<WDTypedResult> result) {
   // TODO(robliao): Remove ScopedTracker below once https://crbug.com/422460 is
   // fixed.
   tracked_objects::ScopedTracker tracking_profile(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "422460 PasswordStoreWin::DBHandler::OnWebDataServiceRequestDone"));
 
   DCHECK_CURRENTLY_ON(BrowserThread::DB);
 
   PendingRequestMap::iterator i = pending_requests_.find(handle);
   DCHECK(i != pending_requests_.end());
 
   ResultCallback result_callback(i->second.result_callback);
   std::unique_ptr<PasswordStore::FormDigest> form = std::move(i->second.form);
   pending_requests_.erase(i);
 
   if (!result) {
     // The WDS returns NULL if it is shutting down. Run callback with empty
     // result.
     result_callback.Run(std::vector<std::unique_ptr<PasswordForm>>());
     return;
   }
 
   DCHECK_EQ(PASSWORD_IE7_RESULT, result->GetType());
-  result_callback.Run(GetIE7Results(result, *form));
+  result_callback.Run(GetIE7Results(result.get(), *form));
 }
 
 PasswordStoreWin::PasswordStoreWin(
     scoped_refptr<base::SingleThreadTaskRunner> main_thread_runner,
     scoped_refptr<base::SingleThreadTaskRunner> db_thread_runner,
     std::unique_ptr<password_manager::LoginDatabase> login_db,
     const scoped_refptr<PasswordWebDataService>& web_data_service)
     : PasswordStoreDefault(main_thread_runner,
                            db_thread_runner,
                            std::move(login_db)) {
@@ skipping 30 matching lines @@
   std::vector<std::unique_ptr<PasswordForm>> matched_forms(
       FillMatchingLogins(form));
   if (matched_forms.empty() && db_handler_) {
     db_handler_->GetIE7Login(
         form, base::Bind(&GetLoginsRequest::NotifyConsumerWithResults,
                          base::Owned(request.release())));
   } else {
     request->NotifyConsumerWithResults(std::move(matched_forms));
   }
 }