Rename PasswordForm::is_zero_click to PasswordForm::skip_next_zero_click.

chrome/browser/password_manager/native_backend_libsecret.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 "chrome/browser/password_manager/native_backend_libsecret.h"
 
 #include <dlfcn.h>
 #include <list>
 
 #include "base/basictypes.h"
@@ skipping 100 matching lines @@
      {"preferred", SECRET_SCHEMA_ATTRIBUTE_INTEGER},
      {"date_created", SECRET_SCHEMA_ATTRIBUTE_STRING},
      {"blacklisted_by_user", SECRET_SCHEMA_ATTRIBUTE_INTEGER},
      {"scheme", SECRET_SCHEMA_ATTRIBUTE_INTEGER},
      {"type", SECRET_SCHEMA_ATTRIBUTE_INTEGER},
      {"times_used", SECRET_SCHEMA_ATTRIBUTE_INTEGER},
      {"date_synced", SECRET_SCHEMA_ATTRIBUTE_STRING},
      {"display_name", SECRET_SCHEMA_ATTRIBUTE_STRING},
      {"avatar_url", SECRET_SCHEMA_ATTRIBUTE_STRING},
      {"federation_url", SECRET_SCHEMA_ATTRIBUTE_STRING},
-     {"is_zero_click", SECRET_SCHEMA_ATTRIBUTE_INTEGER},
+     {"skip_next_zero_click", SECRET_SCHEMA_ATTRIBUTE_INTEGER},

[Mike West, 2015/02/03 14:15:41]

Ditto.

[vasilii, 2015/02/03 19:49:17]

As libsecret is just a wrapper around Gnome keyring, the answer is the same.

      // This field is always "chrome-profile_id" so that we can search for it.
      {"application", SECRET_SCHEMA_ATTRIBUTE_STRING},
      {nullptr, SECRET_SCHEMA_ATTRIBUTE_STRING}}};
 
 const char* GetStringFromAttributes(GHashTable* attrs, const char* keyname) {
   gpointer value = g_hash_table_lookup(attrs, keyname);
   return value ? static_cast<char*>(value) : kEmptyString;
 }
 
 uint32_t GetUintFromAttributes(GHashTable* attrs, const char* keyname) {
@@ skipping 41 matching lines @@
   form->scheme =
       static_cast<PasswordForm::Scheme>(GetUintFromAttributes(attrs, "scheme"));
   int64 date_synced = 0;
   base::StringToInt64(GetStringFromAttributes(attrs, "date_synced"),
                       &date_synced);
   form->date_synced = base::Time::FromInternalValue(date_synced);
   form->display_name =
       UTF8ToUTF16(GetStringFromAttributes(attrs, "display_name"));
   form->avatar_url = GURL(GetStringFromAttributes(attrs, "avatar_url"));
   form->federation_url = GURL(GetStringFromAttributes(attrs, "federation_url"));
-  form->is_zero_click = GetUintFromAttributes(attrs, "is_zero_click");
+  form->skip_next_zero_click =
+      GetUintFromAttributes(attrs, "skip_next_zero_click");
 
   return form.Pass();
 }
 
 class LibsecretAttributesBuilder {
  public:
   LibsecretAttributesBuilder();
   ~LibsecretAttributesBuilder();
   void Append(const std::string& name, const std::string& value);
   void Append(const std::string& name, int64 value);
@@ skipping 209 matching lines @@
   if (!date_created)
     date_created = time(nullptr);
   int64 date_synced = form.date_synced.ToInternalValue();
   GError* error = nullptr;
   secret_password_store_sync(
       &kLibsecretSchema,
       nullptr,                     // Default collection.
       form.origin.spec().c_str(),  // Display name.
       UTF16ToUTF8(form.password_value).c_str(),
       nullptr,  // no cancellable ojbect
-      &error, "origin_url", form.origin.spec().c_str(), "action_url",
-      form.action.spec().c_str(), "username_element",
-      UTF16ToUTF8(form.username_element).c_str(), "username_value",
-      UTF16ToUTF8(form.username_value).c_str(), "password_element",
-      UTF16ToUTF8(form.password_element).c_str(), "submit_element",
-      UTF16ToUTF8(form.submit_element).c_str(), "signon_realm",
-      form.signon_realm.c_str(), "ssl_valid", form.ssl_valid, "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.avatar_url.spec().c_str(), "federation_url",
-      form.federation_url.spec().c_str(), "is_zero_click", form.is_zero_click,
+      &error,

[Mike West, 2015/02/03 14:15:41]

Thanks for reformatting this. It's a good deal more readable now.

[vasilii, 2015/02/03 19:49:17]

Acknowledged.

+      "origin_url", form.origin.spec().c_str(),
+      "action_url", form.action.spec().c_str(),
+      "username_element", UTF16ToUTF8(form.username_element).c_str(),
+      "username_value", UTF16ToUTF8(form.username_value).c_str(),
+      "password_element", UTF16ToUTF8(form.password_element).c_str(),
+      "submit_element", UTF16ToUTF8(form.submit_element).c_str(),
+      "signon_realm", form.signon_realm.c_str(),
+      "ssl_valid", form.ssl_valid,
+      "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.avatar_url.spec().c_str(),
+      "federation_url", form.federation_url.spec().c_str(),
+      "skip_next_zero_click", form.skip_next_zero_click,
       "application", app_string_.c_str(), nullptr);
 
   if (error) {
     VLOG(1) << "Libsecret add raw login failed: " << error->message;
     g_error_free(error);
     return false;
   }
   return true;
 }
 
@@ skipping 152 matching lines @@
   return true;
 }
 
 std::string NativeBackendLibsecret::GetProfileSpecificAppString(
     LocalProfileId id) {
   // Originally, the application string was always just "chrome" and used only
   // so that we had *something* to search for since GNOME Keyring won't search
   // for nothing. Now we use it to distinguish passwords for different profiles.
   return base::StringPrintf("%s-%d", kLibsecretAppString, id);
 }