Make PasswordFormManager::best_matches_ const

ios/chrome/browser/passwords/password_controller.mm

 // Copyright 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.
 
 #import "ios/chrome/browser/passwords/password_controller.h"
 
 #include <stddef.h>
 
 #include <algorithm>
+#include <map>
 #include <memory>
 #include <utility>
 #include <vector>
 
 #import "base/ios/weak_nsobject.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/ptr_util.h"
@@ skipping 318 matching lines @@
   passwordManagerClient_.reset();
 }
 
 - (void)findAndFillPasswordForms:(NSString*)username
                         password:(NSString*)password
                completionHandler:(void (^)(BOOL))completionHandler {
   [self findPasswordFormsWithCompletionHandler:^(
             const std::vector<autofill::PasswordForm>& forms) {
     for (const auto& form : forms) {
       autofill::PasswordFormFillData formData;
-      autofill::PasswordFormMap matches;
+      std::map<base::string16, const autofill::PasswordForm*> matches;
       // Initialize |matches| to satisfy the expectation from
       // InitPasswordFormFillData() that the preferred match (3rd parameter)
       // should be one of the |matches|.
-      auto scoped_form = base::WrapUnique(new autofill::PasswordForm(form));
-      matches.insert(
-          std::make_pair(form.username_value, std::move(scoped_form)));
+      matches.insert(std::make_pair(form.username_value, &form));
       autofill::InitPasswordFormFillData(form, matches, &form, false, false,
                                          &formData);
       [self fillPasswordForm:formData
                 withUsername:base::SysNSStringToUTF16(username)
                     password:base::SysNSStringToUTF16(password)
            completionHandler:completionHandler];
     }
   }];
 }
 
@@ skipping 499 matching lines @@
       break;
 
     case PasswordInfoBarType::UPDATE:
       IOSChromeUpdatePasswordInfoBarDelegate::Create(
           isSmartLockBrandingEnabled, infoBarManager, std::move(form));
       break;
   }
 }
 
 @end