Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / password_manager / native_backend_kwallet_x.cc

diff --git a/src/chrome/browser/password_manager/native_backend_kwallet_x.cc b/src/chrome/browser/password_manager/native_backend_kwallet_x.cc
index ca346cd..0352542 100644 (file)
--- a/src/chrome/browser/password_manager/native_backend_kwallet_x.cc
+++ b/src/chrome/browser/password_manager/native_backend_kwallet_x.cc
@@ -13,13 +13,13 @@
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_restrictions.h"
+#include "chrome/grit/chromium_strings.h"
 #include "components/autofill/core/common/password_form.h"
 #include "content/public/browser/browser_thread.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
-#include "grit/chromium_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using autofill::PasswordForm;
@@ -727,6 +727,10 @@ void NativeBackendKWallet::SerializeValue(const PasswordFormList& forms,
     pickle->WriteInt(form->times_used);
     autofill::SerializeFormData(form->form_data, pickle);
     pickle->WriteInt64(form->date_synced.ToInternalValue());
+    pickle->WriteString16(form->display_name);
+    pickle->WriteString(form->avatar_url.spec());
+    pickle->WriteString(form->federation_url.spec());
+    pickle->WriteBool(form->is_zero_click);
   }
 }
 
@@ -817,6 +821,16 @@ bool NativeBackendKWallet::DeserializeValueSize(const std::string& signon_realm,
       form->date_synced = base::Time::FromInternalValue(date_synced);
     }
 
+    if (version > 3) {
+      if (!iter.ReadString16(&form->display_name) ||
+          !ReadGURL(&iter, warn_only, &form->avatar_url) ||
+          !ReadGURL(&iter, warn_only, &form->federation_url) ||
+          !iter.ReadBool(&form->is_zero_click)) {
+        LogDeserializationWarning(version, signon_realm, false);
+        return false;
+      }
+    }
+
     forms->push_back(form.release());
   }