[Password manager] Human readable origins for Android credentials on chrome://settings/passwords

components/password_manager/core/browser/affiliated_match_helper.h

Index: components/password_manager/core/browser/affiliated_match_helper.h
diff --git a/components/password_manager/core/browser/affiliated_match_helper.h b/components/password_manager/core/browser/affiliated_match_helper.h
index a13e9ea2e76624f515c6ff0b637ccdc3a51da83c..2b32bb852eb7794b6969ec2d98146ad43719d01e 100644
--- a/components/password_manager/core/browser/affiliated_match_helper.h
+++ b/components/password_manager/core/browser/affiliated_match_helper.h
@@ -81,6 +81,13 @@ class AffiliatedMatchHelper : public PasswordStore::Observer,
       const autofill::PasswordForm& android_form,
       const AffiliatedRealmsCallback& result_callback);
 
+  // Retrieves realms of web sites affiliated with the Android credentials in
+  // |forms|, sets realms to form's |affiliated_web_realm| and invokes
+  // |result_callback|.
+  void FillAffiliatedWebRealms(

[engedy, 2016/03/02 14:22:10]

Have you considered making this method take and return (in the callback) a
ScopedVector by value (it's a move-only type). I think that could make the
semantics of this method cleaner.

Also, please add a unittest both for this method (in
affiliated_match_helper_unittest), and also the machinery that uses it in
PasswordStore (in password_store_unittest).

nit: Could you please mention in the comment that the methods works with
whatever's in the cache, and no on-demand network requests will be issued?

nit: I would also suggest renaming this method, see my other comment about
connotations of "fill".

[kolos1, 2016/03/07 10:47:00]

All done.

+      const ScopedVector<autofill::PasswordForm>& forms,
+      const base::Closure& result_callback);
+
   // Removes cached affiliation data that is no longer needed.
   void TrimAffiliationCache();
 
@@ -125,6 +132,14 @@ class AffiliatedMatchHelper : public PasswordStore::Observer,
       const AffiliatedFacets& results,
       bool success);
 
+  // Called back by AffiliationService to supply the list of facets affiliated
+  // with the Android credential in |form|. Sets |form->affiliated_web_realm|,
+  // if |success| is true and |results| is non-empty. Invokes |barrier_closure|.
+  void FillAffiliatedWebRealm(autofill::PasswordForm* form,
+                              base::Closure barrier_closure,
+                              const AffiliatedFacets& results,
+                              bool success);
+
   // PasswordStore::Observer:
   void OnLoginsChanged(const PasswordStoreChangeList& changes) override;