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

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 141 matching lines @@
   form->type = static_cast<PasswordForm::Type>(uint_attr_map["type"]);
   form->times_used = uint_attr_map["times_used"];
   form->scheme = static_cast<PasswordForm::Scheme>(uint_attr_map["scheme"]);
   int64_t date_synced = 0;
   base::StringToInt64(string_attr_map["date_synced"], &date_synced);
   form->date_synced = base::Time::FromInternalValue(date_synced);
   form->display_name = UTF8ToUTF16(string_attr_map["display_name"]);
   form->icon_url = GURL(string_attr_map["avatar_url"]);
   form->federation_origin =
       url::Origin(GURL(string_attr_map["federation_url"]));
-  form->skip_zero_click = uint_attr_map["skip_zero_click"];
+  form->skip_zero_click = uint_attr_map.count("should_skip_zero_click")
+                              ? uint_attr_map["should_skip_zero_click"]
+                              : true;
   form->generation_upload_status =
       static_cast<PasswordForm::GenerationUploadStatus>(
           uint_attr_map["generation_upload_status"]);
   if (!string_attr_map["form_data"].empty()) {
     bool success = DeserializeFormDataFromBase64String(
         string_attr_map["form_data"], &form->form_data);
     FormDeserializationStatus status = success ? GNOME_SUCCESS : GNOME_FAILURE;
     LogFormDataDeserializationStatus(status);
   }
   return form;
@@ skipping 47 matching lines @@
         password_manager::ShouldPSLDomainMatchingApply(registered_domain)
             ? psl_domain_match_metric
             : password_manager::PSL_DOMAIN_MATCH_NOT_USED,
         password_manager::PSL_DOMAIN_MATCH_COUNT);
   }
   return forms;
 }
 
 // Schema is analagous to the fields in PasswordForm.
 const GnomeKeyringPasswordSchema kGnomeSchema = {
-  GNOME_KEYRING_ITEM_GENERIC_SECRET, {
-    { "origin_url", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING },
-    { "action_url", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING },
-    { "username_element", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING },
-    { "username_value", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING },
-    { "password_element", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING },
-    { "submit_element", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING },
-    { "signon_realm", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING },
-    { "ssl_valid", GNOME_KEYRING_ATTRIBUTE_TYPE_UINT32 },
-    { "preferred", GNOME_KEYRING_ATTRIBUTE_TYPE_UINT32 },
-    { "date_created", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING },
-    { "blacklisted_by_user", GNOME_KEYRING_ATTRIBUTE_TYPE_UINT32 },
-    { "scheme", GNOME_KEYRING_ATTRIBUTE_TYPE_UINT32 },
-    { "type", GNOME_KEYRING_ATTRIBUTE_TYPE_UINT32 },
-    { "times_used", GNOME_KEYRING_ATTRIBUTE_TYPE_UINT32 },
-    { "date_synced", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING },
-    { "display_name", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING },
-    { "avatar_url", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING },
-    { "federation_url", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING },
-    { "skip_zero_click", GNOME_KEYRING_ATTRIBUTE_TYPE_UINT32 },
-    { "generation_upload_status", GNOME_KEYRING_ATTRIBUTE_TYPE_UINT32 },
-    { "form_data", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING },
-    // This field is always "chrome" so that we can search for it.
-    { "application", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING },
-    { nullptr }
-  }
-};
+    GNOME_KEYRING_ITEM_GENERIC_SECRET,
+    {{"origin_url", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING},
+     {"action_url", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING},
+     {"username_element", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING},
+     {"username_value", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING},
+     {"password_element", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING},
+     {"submit_element", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING},
+     {"signon_realm", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING},
+     {"ssl_valid", GNOME_KEYRING_ATTRIBUTE_TYPE_UINT32},
+     {"preferred", GNOME_KEYRING_ATTRIBUTE_TYPE_UINT32},
+     {"date_created", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING},
+     {"blacklisted_by_user", GNOME_KEYRING_ATTRIBUTE_TYPE_UINT32},
+     {"scheme", GNOME_KEYRING_ATTRIBUTE_TYPE_UINT32},
+     {"type", GNOME_KEYRING_ATTRIBUTE_TYPE_UINT32},
+     {"times_used", GNOME_KEYRING_ATTRIBUTE_TYPE_UINT32},
+     {"date_synced", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING},
+     {"display_name", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING},
+     {"avatar_url", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING},
+     {"federation_url", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING},
+     {"should_skip_zero_click", GNOME_KEYRING_ATTRIBUTE_TYPE_UINT32},
+     {"generation_upload_status", GNOME_KEYRING_ATTRIBUTE_TYPE_UINT32},
+     {"form_data", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING},
+     // This field is always "chrome" so that we can search for it.
+     {"application", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING},
+     {nullptr}}};
 
 // Sadly, PasswordStore goes to great lengths to switch from the originally
 // calling thread to the DB thread, and to provide an asynchronous API to
 // callers while using a synchronous (virtual) API provided by subclasses like
 // PasswordStoreX -- but GNOME Keyring really wants to be on the GLib main
 // thread, which is the UI thread to us. So we end up having to switch threads
 // again, possibly back to the very same thread (in case the UI thread is the
 // caller, e.g. in the password management UI), and *block* the DB thread
 // waiting for a response from the UI thread to provide the synchronous API
 // PasswordStore expects of us. (It will then in turn switch back to the
@@ skipping 97 matching lines @@
       "preferred", form.preferred,
       "date_created", base::Int64ToString(date_created).c_str(),
       "blacklisted_by_user", form.blacklisted_by_user,
       "type", form.type,
       "times_used", form.times_used,
       "scheme", form.scheme,
       "date_synced", base::Int64ToString(date_synced).c_str(),
       "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,
       nullptr);
   // clang-format on
 }
 
 void GKRMethod::LoginSearch(const PasswordForm& form,
                                const char* app_string) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ skipping 419 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;
 }