Processing USERNAME reply from Autofill server in Password Manager

components/autofill/content/renderer/password_form_conversion_utils.cc

Index: components/autofill/content/renderer/password_form_conversion_utils.cc
diff --git a/components/autofill/content/renderer/password_form_conversion_utils.cc b/components/autofill/content/renderer/password_form_conversion_utils.cc
index dd97e9aaba7621fba147504501066f4e459358d6..f558455d53381db3eb9b4e3d26b5e8c59da965e6 100644
--- a/components/autofill/content/renderer/password_form_conversion_utils.cc
+++ b/components/autofill/content/renderer/password_form_conversion_utils.cc
@@ -6,6 +6,7 @@
 
 #include "base/strings/string_util.h"
 #include "components/autofill/content/renderer/form_autofill_util.h"
+#include "components/autofill/core/common/form_data_predictions.h"
 #include "components/autofill/core/common/password_form.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
@@ -107,6 +108,39 @@ bool LocateSpecificPasswords(std::vector<WebInputElement> passwords,
   return true;
 }
 
+void FindPredictedUsernameElement(
+    const WebFormElement& form,
+    const std::map<autofill::FormData, autofill::FormFieldData>&
+        form_predictions,
+    WebVector<WebFormControlElement>* control_elements,
+    WebInputElement& predicted_username_element) {

[Ilya Sherman, 2015/03/26 00:30:04]

You should never pass a value by non-const reference.  Please use a pointer
here.

[dvadym, 2015/03/26 12:29:13]

Done.

+  FormData form_data;
+  if (!WebFormElementToFormData(form, WebFormControlElement(), REQUIRE_NONE,
+                                EXTRACT_NONE, &form_data, nullptr))
+    return;
+
+  // Prediction forms are not user submitted, but |form| can be user submitted.
+  // We don't care about this flag for finding predictions, so set it to false.
+  form_data.user_submitted = false;
+  auto predictions_iterator = form_predictions.find(form_data);
+  if (predictions_iterator == form_predictions.end())
+    return;
+
+  std::vector<blink::WebFormControlElement> autofillable_elements =
+      ExtractAutofillableElementsFromSet(*control_elements, REQUIRE_NONE);
+  DCHECK_EQ(autofillable_elements.size(), form_data.fields.size());
+
+  const autofill::FormFieldData& username_field = predictions_iterator->second;
+  autofill::FormFieldData form_field;
+  for (size_t i = 0; i < autofillable_elements.size(); ++i) {
+    if (form_data.fields[i].SameFieldAs(username_field)) {
+      predicted_username_element =
+          *toWebInputElement(&autofillable_elements[i]);
+      break;
+    }
+  }
+}
+
 // Get information about a login form encapsulated in a PasswordForm struct.
 // If an element of |form| has an entry in |nonscript_modified_values|, the
 // associated string is used instead of the element's value to create
@@ -115,7 +149,9 @@ void GetPasswordForm(
     const WebFormElement& form,
     PasswordForm* password_form,
     const std::map<const blink::WebInputElement, blink::WebString>*
-        nonscript_modified_values) {
+        nonscript_modified_values,
+    const std::map<autofill::FormData, autofill::FormFieldData>*
+        form_predictions) {
   WebInputElement latest_input_element;
   WebInputElement username_element;
   password_form->username_marked_by_site = false;
@@ -195,6 +231,28 @@ void GetPasswordForm(
     }
   }
 
+  WebInputElement predicted_username_element;
+  if (form_predictions) {
+    FindPredictedUsernameElement(form, *form_predictions, &control_elements,
+                                 predicted_username_element);
+  }
+  // Now server predictions has more priority then autocomplete='username'. It

[vabr (Chromium), 2015/03/26 09:43:55]

An attempt at making this comment shorter and clearer:
// Let server predictions override the selection of the username field. This
allows instant adjusting without changing Chromium code.

[dvadym, 2015/03/26 12:29:13]

Done.

+  // was decided to do in such way since it is more flexible. It allows to make
+  // fixes from server side without changing code.
+  if (!predicted_username_element.isNull() &&
+      username_element != predicted_username_element) {
+    auto it =
+        find(other_possible_usernames.begin(), other_possible_usernames.end(),
+             predicted_username_element.value());
+    if (it != other_possible_usernames.end())
+      other_possible_usernames.erase(it);
+    if (!username_element.isNull()) {
+      other_possible_usernames.push_back(username_element.value());
+    }
+    username_element = predicted_username_element;
+    password_form->parsed_using_autofill_predictions = true;
+  }
+
   if (!username_element.isNull()) {
     password_form->username_element = username_element.nameForAutofill();
     base::string16 username_value = username_element.value();
@@ -273,12 +331,15 @@ void GetPasswordForm(
 scoped_ptr<PasswordForm> CreatePasswordForm(
     const WebFormElement& web_form,
     const std::map<const blink::WebInputElement, blink::WebString>*
-        nonscript_modified_values) {
+        nonscript_modified_values,
+    const std::map<autofill::FormData, autofill::FormFieldData>*
+        form_predictions) {
   if (web_form.isNull())
     return scoped_ptr<PasswordForm>();
 
   scoped_ptr<PasswordForm> password_form(new PasswordForm());
-  GetPasswordForm(web_form, password_form.get(), nonscript_modified_values);
+  GetPasswordForm(web_form, password_form.get(), nonscript_modified_values,
+                  form_predictions);
 
   if (!password_form->action.is_valid())
     return scoped_ptr<PasswordForm>();