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

chrome/browser/password_manager/native_backend_libsecret_unittest.cc

 // Copyright (c) 2015 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 <stdarg.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 869 matching lines @@
 }
 
 TEST_F(NativeBackendLibsecretTest, RemoveLoginsCreatedBetween) {
   CheckRemoveLoginsBetween(CREATED);
 }
 
 TEST_F(NativeBackendLibsecretTest, RemoveLoginsSyncedBetween) {
   CheckRemoveLoginsBetween(SYNCED);
 }
 
-TEST_F(NativeBackendLibsecretTest, DisableAutoSignInForAllLogins) {
+TEST_F(NativeBackendLibsecretTest, DisableAutoSignInForOrigins) {
   NativeBackendLibsecret backend(42);
   backend.Init();
   form_google_.skip_zero_click = false;
   form_facebook_.skip_zero_click = false;
 
   VerifiedAdd(&backend, form_google_);
   VerifiedAdd(&backend, form_facebook_);
 
   EXPECT_EQ(2u, global_mock_libsecret_items->size());
   for (const auto& item : *global_mock_libsecret_items)
     CheckUint32Attribute(item, "should_skip_zero_click", 0);
 
   // Set the canonical forms to the updated value for the following comparison.
   form_google_.skip_zero_click = true;
   form_facebook_.skip_zero_click = true;
   PasswordStoreChangeList expected_changes;
   expected_changes.push_back(
       PasswordStoreChange(PasswordStoreChange::UPDATE, form_facebook_));
-  expected_changes.push_back(
-      PasswordStoreChange(PasswordStoreChange::UPDATE, form_google_));
 
   PasswordStoreChangeList changes;
-  EXPECT_TRUE(backend.DisableAutoSignInForAllLogins(&changes));
+  EXPECT_TRUE(backend.DisableAutoSignInForOrigins(
+      base::Bind(&GURL::operator==, base::Unretained(&form_facebook_.origin)),
+      &changes));
   CheckPasswordChanges(expected_changes, changes);
 
   EXPECT_EQ(2u, global_mock_libsecret_items->size());
-  for (const auto& item : *global_mock_libsecret_items)
-    CheckUint32Attribute(item, "should_skip_zero_click", 1);
+  CheckStringAttribute((*global_mock_libsecret_items)[0],
+                       "origin_url", form_google_.origin.spec());
+  CheckUint32Attribute((*global_mock_libsecret_items)[0],
+                       "should_skip_zero_click", 0);
+  CheckStringAttribute((*global_mock_libsecret_items)[1],
+                       "origin_url", form_facebook_.origin.spec());
+  CheckUint32Attribute((*global_mock_libsecret_items)[1],
+                       "should_skip_zero_click", 1);
 }
 
 TEST_F(NativeBackendLibsecretTest, SomeKeyringAttributesAreMissing) {
   // Absent attributes should be filled with default values.
   NativeBackendLibsecret backend(42);
 
   VerifiedAdd(&backend, form_google_);
 
   EXPECT_EQ(1u, global_mock_libsecret_items->size());
   // Remove a string attribute.
@@ skipping 41 matching lines @@
   EXPECT_EQ(form_google_, *form_list[0]);
 
   EXPECT_EQ(1u, global_mock_libsecret_items->size());
   if (!global_mock_libsecret_items->empty()) {
     CheckMockSecretItem((*global_mock_libsecret_items)[0], form_google_,
                         "chrome-42");
   }
 }
 
 // TODO(mdm): add more basic tests here at some point.