Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / autofill / autofill_dialog_types.cc

diff --git a/src/chrome/browser/ui/autofill/autofill_dialog_types.cc b/src/chrome/browser/ui/autofill/autofill_dialog_types.cc
index 723a1b9..597cea5 100644 (file)
--- a/src/chrome/browser/ui/autofill/autofill_dialog_types.cc
+++ b/src/chrome/browser/ui/autofill/autofill_dialog_types.cc
@@ -137,7 +137,14 @@ ValidityMessages::~ValidityMessages() {}
 
 void ValidityMessages::Set(
     ServerFieldType field, const ValidityMessage& message) {
-  messages_.erase(field);
+  MessageMap::iterator iter = messages_.find(field);
+  if (iter != messages_.end()) {
+    if (!iter->second.text.empty())
+      return;
+
+    messages_.erase(iter);
+  }
+
   messages_.insert(MessageMap::value_type(field, message));
 }