PasswordForm -> FormDigest for GetLogins

chrome/browser/password_manager/native_backend_gnome_x.cc

 // Copyright (c) 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.
 
 #include "chrome/browser/password_manager/native_backend_gnome_x.h"
 
 #include <dlfcn.h>
 #include <gnome-keyring.h>
 #include <stddef.h>
 #include <stdint.h>
@@ skipping 17 matching lines @@
 #include "components/password_manager/core/browser/password_manager_metrics_util.h"
 #include "components/password_manager/core/browser/password_manager_util.h"
 #include "components/password_manager/core/browser/psl_matching_helper.h"
 #include "content/public/browser/browser_thread.h"
 
 using autofill::PasswordForm;
 using base::UTF8ToUTF16;
 using base::UTF16ToUTF8;
 using content::BrowserThread;
 using namespace password_manager::metrics_util;
+using password_manager::PasswordStore;
 
 namespace {
 const int kMaxPossibleTimeTValue = std::numeric_limits<int>::max();
 }
 
 #define GNOME_KEYRING_DEFINE_POINTER(name) \
   typeof(&::gnome_keyring_##name) GnomeKeyringLoader::gnome_keyring_##name;
 GNOME_KEYRING_FOR_EACH_FUNC(GNOME_KEYRING_DEFINE_POINTER)
 #undef GNOME_KEYRING_DEFINE_POINTER
 
@@ skipping 126 matching lines @@
   }
   return form;
 }
 
 // Converts native credentials in |found| to PasswordForms. If not NULL,
 // |lookup_form| is used to filter out results -- only credentials with signon
 // realms passing the PSL matching against |lookup_form->signon_realm| will be
 // kept. PSL matched results get their signon_realm, origin, and action
 // rewritten to those of |lookup_form_|, with the original signon_realm saved
 // into the result's original_signon_realm data member.
-ScopedVector<PasswordForm> ConvertFormList(GList* found,
-                                           const PasswordForm* lookup_form) {
+ScopedVector<PasswordForm> ConvertFormList(
+    GList* found,
+    const PasswordStore::FormDigest* lookup_form) {
   ScopedVector<PasswordForm> forms;
   password_manager::PSLDomainMatchMetric psl_domain_match_metric =
       password_manager::PSL_DOMAIN_MATCH_NONE;
   const bool allow_psl_match =
       lookup_form && password_manager::ShouldPSLDomainMatchingApply(
                          password_manager::GetRegistryControlledDomain(
                              GURL(lookup_form->signon_realm)));
   for (GList* element = g_list_first(found); element;
        element = g_list_next(element)) {
     GnomeKeyringFound* data = static_cast<GnomeKeyringFound*>(element->data);
@@ skipping 86 matching lines @@
   GKRMethod()
       : event_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
                base::WaitableEvent::InitialState::NOT_SIGNALED),
         result_(GNOME_KEYRING_RESULT_CANCELLED) {}
 
   // Action methods. These call gnome_keyring_* functions. Call from UI thread.
   // See GetProfileSpecificAppString() for more information on the app string.
   void AddLogin(const PasswordForm& form, const char* app_string);
   void LoginSearch(const PasswordForm& form, const char* app_string);
   void RemoveLogin(const PasswordForm& form, const char* app_string);
-  void GetLogins(const PasswordForm& form, const char* app_string);
+  void GetLogins(const PasswordStore::FormDigest& form, const char* app_string);
   void GetLoginsList(uint32_t blacklisted_by_user, const char* app_string);
   void GetAllLogins(const char* app_string);
 
   // Use after AddLogin, RemoveLogin.
   GnomeKeyringResult WaitResult();
 
   // Use after LoginSearch, GetLogins, GetLoginsList, GetAllLogins. Replaces the
   // content of |forms| with found logins.
   GnomeKeyringResult WaitResult(ScopedVector<PasswordForm>* forms);
 
@@ skipping 25 matching lines @@
 
   // This is marked as static, but acts on the GKRMethod instance that |data|
   // points to. Saves |result| to |result_|. If the result is OK, overwrites
   // |forms_| with the found credentials. Clears |forms_| otherwise.
   static void OnOperationGetList(GnomeKeyringResult result, GList* list,
                                  gpointer data);
 
   base::WaitableEvent event_;
   GnomeKeyringResult result_;
   ScopedVector<PasswordForm> forms_;
-  // If the credential search is specified by a single form and needs to use PSL
-  // matching, then the specifying form is stored in |lookup_form_|. If PSL
-  // matching is used to find a result, then the results signon realm, origin
-  // and action are stored are replaced by those of |lookup_form_|.
-  // Additionally, |lookup_form_->signon_realm| is also used to narrow down the
-  // found logins to those which indeed PSL-match the look-up. And finally,
-  // |lookup_form_| set to NULL means that PSL matching is not required.
-  std::unique_ptr<PasswordForm> lookup_form_;
+  // If the credential search is specified by a single form and needs to use
+  // PSL matching, then the specifying form is stored in |lookup_form_|. If
+  // PSL matching is used to find a result, then the results signon realm and
+  // origin are stored are replaced by those of |lookup_form_|. Additionally,
+  // |lookup_form_->signon_realm| is also used to narrow down the found logins
+  // to those which indeed PSL-match the look-up. And finally, |lookup_form_|
+  // set to NULL means that PSL matching is not required.
+  std::unique_ptr<const PasswordStore::FormDigest> lookup_form_;
 };
 
 void GKRMethod::AddLogin(const PasswordForm& form, const char* app_string) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   int64_t date_created = form.date_created.ToInternalValue();
   // If we are asked to save a password with 0 date, use the current time.
   // We don't want to actually save passwords as though on January 1, 1601.
   if (!date_created)
     date_created = base::Time::Now().ToInternalValue();
   int64_t date_synced = form.date_synced.ToInternalValue();
@@ skipping 65 matching lines @@
       nullptr,  // destroy_data
       "origin_url", form.origin.spec().c_str(),
       "username_element", UTF16ToUTF8(form.username_element).c_str(),
       "username_value", UTF16ToUTF8(form.username_value).c_str(),
       "password_element", UTF16ToUTF8(form.password_element).c_str(),
       "signon_realm", form.signon_realm.c_str(),
       "application", app_string,
       nullptr);
 }
 
-void GKRMethod::GetLogins(const PasswordForm& form, const char* app_string) {
+void GKRMethod::GetLogins(const PasswordStore::FormDigest& form,
+                          const char* app_string) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  lookup_form_.reset(new PasswordForm(form));
+  lookup_form_.reset(new PasswordStore::FormDigest(form));
   // Search GNOME Keyring for matching passwords.
   ScopedAttributeList attrs(gnome_keyring_attribute_list_new());
   if (!password_manager::ShouldPSLDomainMatchingApply(
           password_manager::GetRegistryControlledDomain(
               GURL(form.signon_realm))) &&
       form.scheme != PasswordForm::SCHEME_HTML) {
     // Don't retrieve the PSL matched and federated credentials.
     AppendString(&attrs, "signon_realm", form.signon_realm);
   }
   AppendString(&attrs, "application", app_string);
@@ skipping 263 matching lines @@
     if (origin_filter.Run(form->origin) && !form->skip_zero_click) {
       form->skip_zero_click = true;
       if (!UpdateLogin(*form, changes))
         return false;
     }
   }
 
   return true;
 }
 
-bool NativeBackendGnome::GetLogins(const PasswordForm& form,
+bool NativeBackendGnome::GetLogins(const PasswordStore::FormDigest& form,
                                    ScopedVector<PasswordForm>* forms) {
   DCHECK_CURRENTLY_ON(BrowserThread::DB);
   GKRMethod method;
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                           base::Bind(&GKRMethod::GetLogins,
                                      base::Unretained(&method),
                                      form, app_string_.c_str()));
   GnomeKeyringResult result = method.WaitResult(forms);
   if (result == GNOME_KEYRING_RESULT_NO_MATCH)
     return true;
@@ skipping 109 matching lines @@
   ScopedVector<PasswordForm> forms;
   if (!GetLoginsBetween(get_begin, get_end, date_to_compare, &forms))
     return false;
 
   for (size_t i = 0; i < forms.size(); ++i) {
     if (!RemoveLogin(*forms[i], changes))
       return false;
   }
   return true;
 }