Update usages of std::map to use ScopedPtrMap.

components/password_manager/core/browser/password_form_manager.h

 // 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.
 
 #ifndef COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_FORM_MANAGER_H_
 #define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_FORM_MANAGER_H_
 
 #include <string>
 #include <vector>
 
 #include "build/build_config.h"
 
 #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"
 #include "components/password_manager/core/browser/password_store.h"
 #include "components/password_manager/core/browser/password_store_consumer.h"
 
 namespace password_manager {
 
 class PasswordManager;
 class PasswordManagerClient;
@@ skipping 302 matching lines @@
   bool UploadPasswordForm(const autofill::FormData& form_data,
                           const autofill::ServerFieldType& password_type);
 
   // Create pending credentials from provisionally saved form and forms received
   // from password store.
   void CreatePendingCredentials();
 
   // 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_;
 
   // Stores provisionally saved form until |pending_credentials_| is created.
   scoped_ptr<const autofill::PasswordForm> provisionally_saved_form_;
   // Stores if for creating |pending_credentials_| other possible usernames
   // option should apply.
   OtherPossibleUsernamesAction other_possible_username_action_;
 
   // The origin url path of observed_form_ tokenized, for convenience when
@@ skipping 65 matching lines @@
   // as our classification of the form can change depending on what data the
   // user has entered.
   FormType form_type_;
 
   DISALLOW_COPY_AND_ASSIGN(PasswordFormManager);
 };
 
 }  // namespace password_manager
 
 #endif  // COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_FORM_MANAGER_H_