Implement origin-based deletion for password manager's auto-signin bit.

components/password_manager/core/browser/password_store_default.cc

Index: components/password_manager/core/browser/password_store_default.cc
diff --git a/components/password_manager/core/browser/password_store_default.cc b/components/password_manager/core/browser/password_store_default.cc
index 79cae2a78be01cd160f1c0522dbb9c270e5c0b6a..4dfe5159542640e9bc8d4a651e43f4445392fe41 100644
--- a/components/password_manager/core/browser/password_store_default.cc
+++ b/components/password_manager/core/browser/password_store_default.cc
@@ -135,16 +135,20 @@ PasswordStoreChangeList PasswordStoreDefault::RemoveLoginsSyncedBetweenImpl(
   return changes;
 }
 
-PasswordStoreChangeList
-PasswordStoreDefault::DisableAutoSignInForAllLoginsImpl() {
+PasswordStoreChangeList PasswordStoreDefault::DisableAutoSignInForOriginsImpl(
+    const base::Callback<bool(const GURL&)>& origin_filter) {
   ScopedVector<autofill::PasswordForm> forms;
   PasswordStoreChangeList changes;
   if (login_db_ && login_db_->GetAutoSignInLogins(&forms)) {
-    if (login_db_->DisableAutoSignInForAllLogins()) {
-      for (const auto* form : forms) {
-        changes.push_back(
-            PasswordStoreChange(PasswordStoreChange::UPDATE, *form));
-      }
+    for (const auto* form : forms) {
+      if (!origin_filter.Run(form->origin))
+        continue;
+
+      if (!login_db_->DisableAutoSignInForOrigin(form->origin))

[vabr (Chromium), 2016/07/08 19:22:03]

This looks rather inefficient. Did you consider just changing the
skip_zero_click bit in |*form| and calling Update on it? (I'm not sure if that's
better, though.)

Alternatively, we could at least keep a set of the origins for which you already
called line 147. If that's not too bad for readability, that would probably be
my preferred solution.

But I have no opinion too strong here, because this is not a frequent action to
be taken.

[msramek, 2016/07/11 13:09:17]

Indeed, I did the change with the expectation that this is not a frequent
action. But I implemented your preferred solution with caching origins.

I rewrote the method quite a bit, because I wanted to avoid the scenario where
form1 and form2 have the same origin, the SQL query fails when called first on
form1, then succeeds second time when called on form2 and we only send |changes|
for form2 where in fact form1 was now also updated.

+        continue;
+
+      changes.push_back(
+          PasswordStoreChange(PasswordStoreChange::UPDATE, *form));
     }
   }
   return changes;