Fill empty fields from keyring result with default values.

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 101 matching lines @@
      {"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},
      // This field is always "chrome-profile_id" so that we can search for it.
      {"application", SECRET_SCHEMA_ATTRIBUTE_STRING},
      {nullptr, SECRET_SCHEMA_ATTRIBUTE_STRING}}};
 
-char* GetStringFromAttributes(GHashTable* attrs, const char* keyname) {
-  return static_cast<char*>(g_hash_table_lookup(attrs, keyname));
+std::string GetStringFromAttributes(GHashTable* attrs, const char* keyname) {

[vabr (Chromium), 2015/01/29 14:10:34]

I would suggest still returning char* and carefully checking for null on the
callsites instead. String copying harms performance, and should be avoided.

[dvadym, 2015/01/29 14:21:40]

Done.

+  gpointer value = g_hash_table_lookup(attrs, keyname);
+  return value ? std::string(static_cast<char*>(value)) : std::string();
 }
 
 uint32_t GetUintFromAttributes(GHashTable* attrs, const char* keyname) {
-  char* value = static_cast<char*>(g_hash_table_lookup(attrs, keyname));
+  gpointer value = g_hash_table_lookup(attrs, keyname);
+  if (value == NULL)

[vabr (Chromium), 2015/01/29 14:10:34]

nit: NULL -> nullptr

[dvadym, 2015/01/29 14:21:40]

Done.

+    return uint32_t();
   uint32_t result;
-  bool value_ok = base::StringToUint(value, &result);
+  bool value_ok = base::StringToUint(static_cast<char*>(value), &result);
   DCHECK(value_ok);
   return result;
 }
 
 // Convert the attributes into a new PasswordForm.
 // Note: does *not* get the actual password, as that is not a key attribute!
 // Returns nullptr if the attributes are for the wrong application.
 scoped_ptr<PasswordForm> FormOutOfAttributes(GHashTable* attrs) {
-  base::StringPiece app_value = GetStringFromAttributes(attrs, "application");
+  std::string app_string = GetStringFromAttributes(attrs, "application");

[vabr (Chromium), 2015/01/29 14:10:34]

Please do not convert to std::string, that harms performance. Instead, check if
the string piece is null in the if condition below, and return null then.

[dvadym, 2015/01/29 14:21:39]

Done.

+  base::StringPiece app_value = app_string;
   if (!app_value.starts_with(kLibsecretAppString))
     return scoped_ptr<PasswordForm>();
 
   scoped_ptr<PasswordForm> form(new PasswordForm());
   form->origin = GURL(GetStringFromAttributes(attrs, "origin_url"));
   form->action = GURL(GetStringFromAttributes(attrs, "action_url"));
   form->username_element =
       UTF8ToUTF16(GetStringFromAttributes(attrs, "username_element"));
   form->username_value =
       UTF8ToUTF16(GetStringFromAttributes(attrs, "username_value"));
@@ skipping 433 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);
 }