CREDENTIAL: Disable auto sign-in by default for existing credentials.

chrome/browser/password_manager/native_backend_libsecret.cc

Index: chrome/browser/password_manager/native_backend_libsecret.cc
diff --git a/chrome/browser/password_manager/native_backend_libsecret.cc b/chrome/browser/password_manager/native_backend_libsecret.cc
index 25cd9ebf2a8e4fc3ca5e2c39a9c9c49a145460ae..3d86a1168c3ef3f88429ac45bbcdd88bf5105f12 100644
--- a/chrome/browser/password_manager/native_backend_libsecret.cc
+++ b/chrome/browser/password_manager/native_backend_libsecret.cc
@@ -122,7 +122,7 @@ const SecretSchema kLibsecretSchema = {
      {"display_name", SECRET_SCHEMA_ATTRIBUTE_STRING},
      {"avatar_url", SECRET_SCHEMA_ATTRIBUTE_STRING},
      {"federation_url", SECRET_SCHEMA_ATTRIBUTE_STRING},
-     {"skip_zero_click", SECRET_SCHEMA_ATTRIBUTE_INTEGER},
+     {"should_skip_zero_click", SECRET_SCHEMA_ATTRIBUTE_INTEGER},
      {"generation_upload_status", SECRET_SCHEMA_ATTRIBUTE_INTEGER},
      {"form_data", SECRET_SCHEMA_ATTRIBUTE_STRING},
      // This field is always "chrome-profile_id" so that we can search for it.
@@ -195,7 +195,12 @@ scoped_ptr<PasswordForm> FormOutOfAttributes(GHashTable* attrs) {
   form->icon_url = GURL(GetStringFromAttributes(attrs, "avatar_url"));
   form->federation_origin =
       url::Origin(GURL(GetStringFromAttributes(attrs, "federation_url")));
-  form->skip_zero_click = GetUintFromAttributes(attrs, "skip_zero_click");
+  // Only overwrite the default value of 'skip_zero_click' if we can read a
+  // value from the backend. Otherwise, leave it alone.

[vasilii, 2016/02/26 11:46:31]

Any reason not to assign the member in all the cases?

[Mike West, 2016/02/26 12:29:34]

*shrug* I can add an assignment.

+  if (g_hash_table_lookup(attrs, "should_skip_zero_click")) {
+    form->skip_zero_click = GetUintFromAttributes(attrs,
+                                                  "should_skip_zero_click");
+  }
   form->generation_upload_status =
       static_cast<PasswordForm::GenerationUploadStatus>(
           GetUintFromAttributes(attrs, "generation_upload_status"));
@@ -476,7 +481,7 @@ bool NativeBackendLibsecret::RawAddLogin(const PasswordForm& form) {
       "display_name", UTF16ToUTF8(form.display_name).c_str(),
       "avatar_url", form.icon_url.spec().c_str(),
       "federation_url", form.federation_origin.Serialize().c_str(),
-      "skip_zero_click", form.skip_zero_click,
+      "should_skip_zero_click", form.skip_zero_click,
       "generation_upload_status", form.generation_upload_status,
       "form_data", form_data.c_str(),
       "application", app_string_.c_str(),