Change ScopedVector to vector<unique_ptr> in the password's UI code.

chrome/browser/ui/passwords/manage_passwords_ui_controller.cc

 // Copyright 2014 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_ui_controller.h"
 
 #include <utility>
 
 #include "base/auto_reset.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 27 matching lines @@
 namespace {
 
 password_manager::PasswordStore* GetPasswordStore(
     content::WebContents* web_contents) {
   return PasswordStoreFactory::GetForProfile(
              Profile::FromBrowserContext(web_contents->GetBrowserContext()),
              ServiceAccessType::EXPLICIT_ACCESS).get();
 }
 
 std::vector<std::unique_ptr<autofill::PasswordForm>> CopyFormVector(
-    const ScopedVector<autofill::PasswordForm>& forms) {
+    const std::vector<std::unique_ptr<autofill::PasswordForm>>& forms) {
   std::vector<std::unique_ptr<autofill::PasswordForm>> result(forms.size());
   for (size_t i = 0; i < forms.size(); ++i)
     result[i].reset(new autofill::PasswordForm(*forms[i]));
   return result;
 }
 
 }  // namespace
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(ManagePasswordsUIController);
 
@@ skipping 31 matching lines @@
 
 void ManagePasswordsUIController::OnUpdatePasswordSubmitted(
     std::unique_ptr<PasswordFormManager> form_manager) {
   DestroyAccountChooser();
   passwords_data_.OnUpdatePassword(std::move(form_manager));
   bubble_status_ = SHOULD_POP_UP;
   UpdateBubbleAndIconVisibility();
 }
 
 bool ManagePasswordsUIController::OnChooseCredentials(
-    ScopedVector<autofill::PasswordForm> local_credentials,
-    ScopedVector<autofill::PasswordForm> federated_credentials,
+    std::vector<std::unique_ptr<autofill::PasswordForm>> local_credentials,
+    std::vector<std::unique_ptr<autofill::PasswordForm>> federated_credentials,
     const GURL& origin,
     const ManagePasswordsState::CredentialsCallback& callback) {
   DCHECK(!local_credentials.empty() || !federated_credentials.empty());
   PasswordDialogController::FormsVector locals =
       CopyFormVector(local_credentials);
   PasswordDialogController::FormsVector federations =
       CopyFormVector(federated_credentials);
   passwords_data_.OnRequestCredentials(
       std::move(local_credentials), std::move(federated_credentials), origin);
   passwords_data_.set_credentials_callback(callback);
   dialog_controller_.reset(new PasswordDialogControllerImpl(
       Profile::FromBrowserContext(web_contents()->GetBrowserContext()),
       this));
   dialog_controller_->ShowAccountChooser(
       CreateAccountChooser(dialog_controller_.get()),
       std::move(locals), std::move(federations));
   UpdateBubbleAndIconVisibility();
   return true;
 }
 
 void ManagePasswordsUIController::OnAutoSignin(
-    ScopedVector<autofill::PasswordForm> local_forms,
+    std::vector<std::unique_ptr<autofill::PasswordForm>> local_forms,
     const GURL& origin) {
   DCHECK(!local_forms.empty());
   DestroyAccountChooser();
   passwords_data_.OnAutoSignin(std::move(local_forms), origin);
   bubble_status_ = SHOULD_POP_UP;
   UpdateBubbleAndIconVisibility();
 }
 
 void ManagePasswordsUIController::OnPromptEnableAutoSignin() {
   // Both the account chooser and the previous prompt shouldn't be closed.
@@ skipping 90 matching lines @@
       passwords_data_.form_manager();
   return form_manager->pending_credentials();
 }
 
 bool ManagePasswordsUIController::IsPasswordOverridden() const {
   const password_manager::PasswordFormManager* form_manager =
       passwords_data_.form_manager();
   return form_manager ? form_manager->password_overridden() : false;
 }
 
-const std::vector<const autofill::PasswordForm*>&
+const std::vector<std::unique_ptr<autofill::PasswordForm>>&
 ManagePasswordsUIController::GetCurrentForms() const {
   return passwords_data_.GetCurrentForms();
 }
 
-const std::vector<const autofill::PasswordForm*>&
+const std::vector<std::unique_ptr<autofill::PasswordForm>>&
 ManagePasswordsUIController::GetFederatedForms() const {
-  return passwords_data_.federated_credentials_forms();
+  return passwords_data_.federation_providers_forms();
 }
 
 password_manager::InteractionsStats*
 ManagePasswordsUIController::GetCurrentInteractionStats() const {
   DCHECK_EQ(password_manager::ui::PENDING_PASSWORD_STATE, GetState());
   password_manager::PasswordFormManager* form_manager =
       passwords_data_.form_manager();
   return password_manager::FindStatsByUsername(
       form_manager->interactions_stats(),
       form_manager->pending_credentials().username_value);
@@ skipping 201 matching lines @@
     passwords_data_.TransitionToState(password_manager::ui::MANAGE_STATE);
   }
 }
 
 void ManagePasswordsUIController::WebContentsDestroyed() {
   password_manager::PasswordStore* password_store =
       GetPasswordStore(web_contents());
   if (password_store)
     password_store->RemoveObserver(this);
 }