Processing USERNAME reply from Autofill server in Password Manager

components/autofill/core/browser/autofill_type.cc

Index: components/autofill/core/browser/autofill_type.cc
diff --git a/components/autofill/core/browser/autofill_type.cc b/components/autofill/core/browser/autofill_type.cc
index 276e1754e673cf4935e98e619690763d7c9e67f6..b1e8930adbb8a9039378813a2ab346ea1bc3f1a0 100644
--- a/components/autofill/core/browser/autofill_type.cc
+++ b/components/autofill/core/browser/autofill_type.cc
@@ -137,6 +137,10 @@ FieldTypeGroup AutofillType::group() const {
       NOTREACHED();
       return NO_GROUP;
 
+    case USERNAME:
+    case USERNAME_AND_EMAIL_ADDRESS:

[Garrett Casto, 2015/03/24 01:31:12]

The fact that this doesn't return EMAIL might break some things (e.g.
AutofillProfile). The principled way of dealing with this would probably be to
treat these enums as bit masks and "|" them together, but I'm not sure that we
really want to do that. Given that we currently don't care that this returns
USERNAME_FIELD for anything, I would just have this return EMAIL.

[dvadym, 2015/03/24 16:38:49]

Ok, USERNAME_AND_EMAIL_ADDRESS -> EMAIL group

+      return USERNAME_FIELD;
+
     case UNKNOWN_TYPE:
       break;
   }
@@ -613,6 +617,10 @@ std::string AutofillType::ToString() const {
       return "ADDRESS_BILLING_DEPENDENT_LOCALITY";
     case NOT_ACCOUNT_CREATION_PASSWORD:
       return "NOT_ACCOUNT_CREATION_PASSWORD";
+    case USERNAME:
+      return "USERNAME";
+    case USERNAME_AND_EMAIL_ADDRESS:
+      return "USERNAME_AND_EMAIL_ADDRESS";
 
     case MAX_VALID_FIELD_TYPE:
       return std::string();