GetLoginsRequest: Use ScopedVector to express ownership of forms

components/password_manager/content/browser/credential_manager_dispatcher.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 "components/password_manager/content/browser/credential_manager_dispatcher.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/common/password_form.h"
 #include "components/password_manager/content/browser/content_password_manager_driver.h"
 #include "components/password_manager/content/browser/content_password_manager_driver_factory.h"
 #include "components/password_manager/content/browser/credential_manager_password_form_manager.h"
 #include "components/password_manager/content/common/credential_manager_messages.h"
 #include "components/password_manager/content/common/credential_manager_types.h"
 #include "components/password_manager/core/browser/password_manager_client.h"
 #include "components/password_manager/core/browser/password_store.h"
 #include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "ipc/ipc_message_macros.h"
 
 namespace password_manager {
 
 class CredentialManagerDispatcher::PendingRequestTask
     : public PasswordStoreConsumer {
  public:
+  // TODO(mkwst): De-inline the methods in this class. http://goo.gl/RmFwKd
   PendingRequestTask(CredentialManagerDispatcher* const dispatcher,
                      int request_id,
                      bool request_zero_click_only,
                      const GURL& request_origin,
                      const std::vector<GURL>& request_federations)
       : dispatcher_(dispatcher),
         id_(request_id),
         zero_click_only_(request_zero_click_only),
         origin_(request_origin) {
     for (const GURL& origin : request_federations)
       federations_.insert(origin.spec());
   }
 
   int id() const { return id_; }
 
   // PasswordStoreConsumer implementation.
-  void OnGetPasswordStoreResults(
-      const std::vector<autofill::PasswordForm*>& results) override {
+  void OnGetPasswordStoreResults() override {
     // We own the PasswordForm instances, so we're responsible for cleaning
     // up the instances we don't add to |local_results| or |federated_results|.
-    //
-    // TODO(mkwst): Switch this and PromptUserToChooseCredentials() to use
-    // ScopedVector.
-    std::vector<autofill::PasswordForm*> local_results;
-    std::vector<autofill::PasswordForm*> federated_results;
-    for (autofill::PasswordForm* form : results) {
-      if (form->origin == origin_)
+    ScopedVector<autofill::PasswordForm> local_results;
+    ScopedVector<autofill::PasswordForm> federated_results;
+    for (auto& form : *results()) {
+      if (form->origin == origin_) {
         local_results.push_back(form);
-      else if (federations_.count(form->origin.spec()))
+        form = nullptr;
+      } else if (federations_.count(form->origin.spec())) {
         federated_results.push_back(form);
-      else
-        delete form;
+        form = nullptr;
+      }
     }
 
     if ((local_results.empty() && federated_results.empty()) ||
         dispatcher_->web_contents()->GetLastCommittedURL().GetOrigin() !=
             origin_) {
       dispatcher_->SendCredential(id_, CredentialInfo());
       return;
     }
     if (local_results.size() == 1 && dispatcher_->IsZeroClickAllowed()) {
       // TODO(mkwst): Use the `one_time_disable_zero_click` flag on the result
       // to prevent auto-sign-in, once that flag is implemented.
       CredentialInfo info(*local_results[0],
                           local_results[0]->federation_url.is_empty()
                               ? CredentialType::CREDENTIAL_TYPE_LOCAL
                               : CredentialType::CREDENTIAL_TYPE_FEDERATED);
-      STLDeleteElements(&local_results);
-      STLDeleteElements(&federated_results);
       dispatcher_->SendCredential(id_, info);
       return;
     }
 
     if (zero_click_only_ ||
         !dispatcher_->client()->PromptUserToChooseCredentials(
-            local_results, federated_results,
+            local_results.Pass(), federated_results.Pass(),
             base::Bind(&CredentialManagerDispatcher::SendCredential,
                        base::Unretained(dispatcher_), id_))) {
-      STLDeleteElements(&local_results);
-      STLDeleteElements(&federated_results);
       dispatcher_->SendCredential(id_, CredentialInfo());
     }
   }
 
  private:
   // Backlink to the CredentialManagerDispatcher that owns this object.
   CredentialManagerDispatcher* const dispatcher_;
 
   const int id_;
   const bool zero_click_only_;
@@ skipping 136 matching lines @@
   DCHECK(pending_request_);
   DCHECK_EQ(pending_request_->id(), request_id);
   web_contents()->GetRenderViewHost()->Send(
       new CredentialManagerMsg_SendCredential(
           web_contents()->GetRenderViewHost()->GetRoutingID(),
           pending_request_->id(), info));
   pending_request_.reset();
 }
 
 }  // namespace password_manager