Update usages of std::map to use ScopedPtrMap.

chrome/browser/ui/passwords/manage_passwords_state.cc

 // Copyright 2015 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/ui/passwords/manage_passwords_state.h"
 
 #include "components/password_manager/core/browser/browser_save_password_progress_logger.h"
 #include "components/password_manager/core/browser/password_form_manager.h"
 #include "components/password_manager/core/browser/password_manager_client.h"
 #include "components/password_manager/core/common/credential_manager_types.h"
 
 using password_manager::PasswordFormManager;
 using autofill::PasswordFormMap;
 
 namespace {
 
-// Converts the map with pointers or const pointers to the vector of const
-// pointers.
-template <typename T>
-std::vector<const T*> MapToVector(
-    const std::map<base::string16, T*>& map) {
-  std::vector<const autofill::PasswordForm*> ret;
+// Returns a vector containing the values of a map.
+template <typename Map>
+std::vector<typename Map::mapped_type> MapToVector(const Map& map) {
+  std::vector<typename Map::mapped_type> ret;
   ret.reserve(map.size());
   for (const auto& form_pair : map)
     ret.push_back(form_pair.second);
+  return ret;
+}
+
+// Takes a ScopedPtrMap. Returns a vector of non-owned pointers to the elements
+// inside the scoped_ptrs.
+template <typename Map>
+std::vector<const typename Map::mapped_type::element_type*>
+ScopedPtrMapToVector(const Map& map) {
+  std::vector<const typename Map::mapped_type::element_type*> ret;
+  ret.reserve(map.size());
+  for (const auto& form_pair : map)
+    ret.push_back(form_pair.second);
   return ret;
 }
 
 ScopedVector<const autofill::PasswordForm> DeepCopyMapToVector(
     const PasswordFormMap& password_form_map) {
   ScopedVector<const autofill::PasswordForm> ret;
   ret.reserve(password_form_map.size());
   for (const auto& form_pair : password_form_map)
     ret.push_back(new autofill::PasswordForm(*form_pair.second));
   return ret.Pass();
@@ skipping 65 matching lines @@
     : state_(password_manager::ui::INACTIVE_STATE),
       client_(nullptr) {
 }
 
 ManagePasswordsState::~ManagePasswordsState() {}
 
 void ManagePasswordsState::OnPendingPassword(
       scoped_ptr<password_manager::PasswordFormManager> form_manager) {
   ClearData();
   form_manager_ = form_manager.Pass();
-  current_forms_weak_ = MapToVector(form_manager_->best_matches());
+  current_forms_weak_ = ScopedPtrMapToVector(form_manager_->best_matches());
   origin_ = form_manager_->pending_credentials().origin;
   SetState(password_manager::ui::PENDING_PASSWORD_STATE);
 }
 
 void ManagePasswordsState::OnRequestCredentials(
     ScopedVector<autofill::PasswordForm> local_credentials,
     ScopedVector<autofill::PasswordForm> federated_credentials,
     const GURL& origin) {
   ClearData();
   local_credentials_forms_ = ConstifyVector(&local_credentials);
@@ skipping 154 matching lines @@
 void ManagePasswordsState::SetState(password_manager::ui::State state) {
   DCHECK(client_);
   if (client_->IsLoggingActive()) {
     password_manager::BrowserSavePasswordProgressLogger logger(client_);
     logger.LogNumber(
         autofill::SavePasswordProgressLogger::STRING_NEW_UI_STATE,
         state);
   }
   state_ = state;
 }