Update usages of std::map to use ScopedPtrMap.

components/password_manager/core/browser/password_form_manager.h

Index: components/password_manager/core/browser/password_form_manager.h
diff --git a/components/password_manager/core/browser/password_form_manager.h b/components/password_manager/core/browser/password_form_manager.h
index 70eeccf9aea470cf1ddf94d31e96d6e65cc4b808..20b319c2aeeee67beaa29eb851dcc8b50841351e 100644
--- a/components/password_manager/core/browser/password_form_manager.h
+++ b/components/password_manager/core/browser/password_form_manager.h
@@ -12,7 +12,6 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "base/stl_util.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/common/password_form.h"
 #include "components/password_manager/core/browser/password_manager_driver.h"
@@ -335,12 +334,8 @@ class PasswordFormManager : public PasswordStoreConsumer {
   // Set of PasswordForms from the DB that best match the form
   // being managed by this. Use a map instead of vector, because we most
   // frequently require lookups by username value in IsNewLogin.
-  // TODO(vabr): Consider using ScopedPtrHashMap instead of the deleter below.
   autofill::PasswordFormMap best_matches_;
 
-  // Cleans up when best_matches_ goes out of scope.
-  STLValueDeleter<autofill::PasswordFormMap> best_matches_deleter_;
-
   // The PasswordForm from the page or dialog managed by |this|.
   const autofill::PasswordForm observed_form_;