Make PasswordFormManager::best_matches_ const

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 <algorithm>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "components/password_manager/core/browser/browser_save_password_progress_logger.h"
 #include "components/password_manager/core/browser/log_manager.h"
 #include "components/password_manager/core/browser/password_form_manager.h"
 #include "components/password_manager/core/browser/password_manager.h"
 #include "components/password_manager/core/browser/password_manager_client.h"
 
 using password_manager::PasswordFormManager;
-using autofill::PasswordFormMap;
 
 namespace {
 
 std::vector<std::unique_ptr<autofill::PasswordForm>> DeepCopyMapToVector(
-    const PasswordFormMap& password_form_map) {
+    const std::map<base::string16, const autofill::PasswordForm*>&
+        password_form_map) {
   std::vector<std::unique_ptr<autofill::PasswordForm>> ret;
   ret.reserve(password_form_map.size());
   for (const auto& form_pair : password_form_map)
     ret.push_back(base::MakeUnique<autofill::PasswordForm>(*form_pair.second));
   return ret;
 }
 
 void AppendDeepCopyVector(
-    const std::vector<std::unique_ptr<autofill::PasswordForm>>& forms,
+    const std::vector<const autofill::PasswordForm*>& forms,
     std::vector<std::unique_ptr<autofill::PasswordForm>>* result) {
   result->reserve(result->size() + forms.size());
   for (const auto& form : forms)
     result->push_back(base::MakeUnique<autofill::PasswordForm>(*form));
 }
 
 // Updates one form in |forms| that has the same unique key as |updated_form|.
 // Returns true if the form was found and updated.
 bool UpdateFormInVector(
     const autofill::PasswordForm& updated_form,
@@ skipping 96 matching lines @@
     local_credentials_forms_.push_back(base::MakeUnique<autofill::PasswordForm>(
         form_manager_->pending_credentials()));
   }
   AppendDeepCopyVector(form_manager_->federated_matches(),
                        &local_credentials_forms_);
   origin_ = form_manager_->observed_form().origin;
   SetState(password_manager::ui::CONFIRMATION_STATE);
 }
 
 void ManagePasswordsState::OnPasswordAutofilled(
-    const PasswordFormMap& password_form_map,
+    const std::map<base::string16, const autofill::PasswordForm*>&
+        password_form_map,
     const GURL& origin,
-    const std::vector<std::unique_ptr<autofill::PasswordForm>>*
-        federated_matches) {
+    const std::vector<const autofill::PasswordForm*>* federated_matches) {
   DCHECK(!password_form_map.empty());
   ClearData();
-  bool only_PSL_matches =
-      std::all_of(password_form_map.begin(), password_form_map.end(),
-                  [](const PasswordFormMap::value_type& p) {
-                    return p.second->is_public_suffix_match;
-                  });
+  bool only_PSL_matches = std::all_of(
+      password_form_map.begin(), password_form_map.end(),
+      [](const std::map<base::string16,
+                        const autofill::PasswordForm*>::value_type& p) {
+        return p.second->is_public_suffix_match;
+      });
   if (only_PSL_matches) {
     // Don't show the UI for PSL matched passwords. They are not stored for this
     // page and cannot be deleted.
     origin_ = GURL();
     SetState(password_manager::ui::INACTIVE_STATE);
   } else {
     local_credentials_forms_ = DeepCopyMapToVector(password_form_map);
     if (federated_matches)
       AppendDeepCopyVector(*federated_matches, &local_credentials_forms_);
     origin_ = origin;
@@ skipping 81 matching lines @@
   DCHECK(client_);
   if (client_->GetLogManager()->IsLoggingActive()) {
     password_manager::BrowserSavePasswordProgressLogger logger(
         client_->GetLogManager());
     logger.LogNumber(
         autofill::SavePasswordProgressLogger::STRING_NEW_UI_STATE,
         state);
   }
   state_ = state;
 }