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

chrome/browser/ui/passwords/manage_passwords_bubble_model.cc

 // Copyright 2013 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_bubble_model.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <limits>
@@ skipping 32 matching lines @@
 
 void CleanStatisticsForSite(Profile* profile, const GURL& origin) {
   DCHECK(profile);
   password_manager::PasswordStore* password_store =
       PasswordStoreFactory::GetForProfile(profile,
                                           ServiceAccessType::IMPLICIT_ACCESS)
           .get();
   password_store->RemoveSiteStats(origin.GetOrigin());
 }
 
-ScopedVector<const autofill::PasswordForm> DeepCopyForms(
-    const std::vector<const autofill::PasswordForm*>& forms) {
-  ScopedVector<const autofill::PasswordForm> result;
+std::vector<autofill::PasswordForm> DeepCopyForms(
+    const std::vector<std::unique_ptr<autofill::PasswordForm>>& forms) {
+  std::vector<autofill::PasswordForm> result;
   result.reserve(forms.size());
   std::transform(forms.begin(), forms.end(), std::back_inserter(result),
-                 [](const autofill::PasswordForm* form) {
-    return new autofill::PasswordForm(*form);
-  });
+                 [](const std::unique_ptr<autofill::PasswordForm>& form) {
+                   return *form;
+                 });
   return result;
 }
 
 password_bubble_experiment::SmartLockBranding GetSmartLockBrandingState(
     Profile* profile) {
   const ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetForProfile(profile);
   return password_bubble_experiment::GetSmartLockBrandingState(sync_service);
 }
 
@@ skipping 128 matching lines @@
   }
 }
 
 ManagePasswordsBubbleModel::ManagePasswordsBubbleModel(
     base::WeakPtr<PasswordsModelDelegate> delegate,
     DisplayReason display_reason)
     : password_overridden_(false),
       delegate_(std::move(delegate)) {
   origin_ = delegate_->GetOrigin();
   state_ = delegate_->GetState();
+  password_manager::InteractionsStats interaction_stats;
   if (state_ == password_manager::ui::PENDING_PASSWORD_STATE ||
       state_ == password_manager::ui::PENDING_PASSWORD_UPDATE_STATE) {
     pending_password_ = delegate_->GetPendingPassword();
-    local_credentials_ = DeepCopyForms(delegate_->GetCurrentForms());
-  } else if (state_ == password_manager::ui::CONFIRMATION_STATE) {
-    // We don't need anything.
-  } else if (state_ == password_manager::ui::AUTO_SIGNIN_STATE) {
-    pending_password_ = delegate_->GetPendingPassword();
-  } else {
-    local_credentials_ = DeepCopyForms(delegate_->GetCurrentForms());
-  }
-
-  if (state_ == password_manager::ui::PENDING_PASSWORD_STATE ||
-      state_ == password_manager::ui::PENDING_PASSWORD_UPDATE_STATE) {
+    if (state_ == password_manager::ui::PENDING_PASSWORD_UPDATE_STATE) {
+      local_credentials_ = DeepCopyForms(delegate_->GetCurrentForms());
+      password_overridden_ = delegate_->IsPasswordOverridden();
+    } else {
+      interaction_stats.origin_domain = origin_.GetOrigin();
+      interaction_stats.username_value = pending_password_.username_value;
+      password_manager::InteractionsStats* stats =
+          delegate_->GetCurrentInteractionStats();
+      if (stats) {
+        DCHECK_EQ(interaction_stats.username_value, stats->username_value);
+        DCHECK_EQ(interaction_stats.origin_domain, stats->origin_domain);
+        interaction_stats.dismissal_count = stats->dismissal_count;
+      }
+    }
     UpdatePendingStateTitle();
   } else if (state_ == password_manager::ui::CONFIRMATION_STATE) {
     title_ =
         l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_CONFIRM_GENERATED_TITLE);
   } else if (state_ == password_manager::ui::AUTO_SIGNIN_STATE) {
-    // There is no title.
+    pending_password_ = delegate_->GetPendingPassword();
   } else if (state_ == password_manager::ui::MANAGE_STATE) {
+    local_credentials_ = DeepCopyForms(delegate_->GetCurrentForms());
     UpdateManageStateTitle();
+    manage_link_ =
+        l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK);
   }
 
-  password_manager::InteractionsStats interaction_stats;
   if (state_ == password_manager::ui::CONFIRMATION_STATE) {
     base::string16 save_confirmation_link =
         l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_LINK);
     int confirmation_text_id = IDS_MANAGE_PASSWORDS_CONFIRM_GENERATED_TEXT;
     if (GetSmartLockBrandingState(GetProfile()) ==
         password_bubble_experiment::SmartLockBranding::FULL) {
       std::string management_hostname =
           GURL(password_manager::kPasswordManagerAccountDashboardURL).host();
       save_confirmation_link = base::UTF8ToUTF16(management_hostname);
       confirmation_text_id =
           IDS_MANAGE_PASSWORDS_CONFIRM_GENERATED_SMART_LOCK_TEXT;
     }
 
     size_t offset;
     save_confirmation_text_ =
         l10n_util::GetStringFUTF16(
             confirmation_text_id, save_confirmation_link, &offset);
     save_confirmation_link_range_ =
         gfx::Range(offset, offset + save_confirmation_link.length());
-  } else if (state_ == password_manager::ui::PENDING_PASSWORD_STATE) {
-    interaction_stats.origin_domain = origin_.GetOrigin();
-    interaction_stats.username_value = pending_password_.username_value;
-    password_manager::InteractionsStats* stats =
-        delegate_->GetCurrentInteractionStats();
-    if (stats) {
-      DCHECK_EQ(interaction_stats.username_value, stats->username_value);
-      DCHECK_EQ(interaction_stats.origin_domain, stats->origin_domain);
-      interaction_stats.dismissal_count = stats->dismissal_count;
-    }
-  } else if (state_ == password_manager::ui::PENDING_PASSWORD_UPDATE_STATE) {
-    password_overridden_ = delegate_->IsPasswordOverridden();
   }
 
-  manage_link_ =
-      l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK);
-
   password_manager::metrics_util::UIDisplayDisposition display_disposition =
       metrics_util::AUTOMATIC_WITH_PASSWORD_PENDING;
   if (display_reason == USER_ACTION) {
     switch (state_) {
       case password_manager::ui::PENDING_PASSWORD_STATE:
         display_disposition = metrics_util::MANUAL_WITH_PASSWORD_PENDING;
         break;
       case password_manager::ui::PENDING_PASSWORD_UPDATE_STATE:
         display_disposition =
             metrics_util::MANUAL_WITH_PASSWORD_PENDING_UPDATE;
@@ skipping 230 matching lines @@
     return metrics_util::NO_UPDATE_SUBMISSION;
   }
   if (state_ != password_manager::ui::PENDING_PASSWORD_UPDATE_STATE)
     return metrics_util::NO_UPDATE_SUBMISSION;
   if (password_overridden_)
     return update_events[3][behavior];
   if (ShouldShowMultipleAccountUpdateUI())
     return update_events[2][behavior];
   return update_events[1][behavior];
 }