Processing USERNAME reply from Autofill server in Password Manager

components/autofill/content/common/autofill_messages.h

Index: components/autofill/content/common/autofill_messages.h
diff --git a/components/autofill/content/common/autofill_messages.h b/components/autofill/content/common/autofill_messages.h
index 078ff83427e4180bbe7fb03dd7fcedfae5f70d44..c79979889631e046a786c8c9514470a82ac3f4b9 100644
--- a/components/autofill/content/common/autofill_messages.h
+++ b/components/autofill/content/common/autofill_messages.h
@@ -4,6 +4,7 @@
 
 // Multiply-included message file, hence no include guard.
 
+#include <map>
 #include <string>
 #include <vector>
 
@@ -37,12 +38,12 @@ IPC_ENUM_TRAITS_MAX_VALUE(base::i18n::TextDirection,
 IPC_STRUCT_TRAITS_BEGIN(autofill::WebElementDescriptor)
   IPC_STRUCT_TRAITS_MEMBER(descriptor)
   IPC_STRUCT_TRAITS_MEMBER(retrieval_method)
-IPC_STRUCT_TRAITS_END()
+  IPC_STRUCT_TRAITS_END()

[vabr (Chromium), 2015/03/25 10:12:33]

Please revert the indenting changes.

[Mike West, 2015/03/25 10:24:56]

+1. This makes it quite difficult to review the IPC changes.

[dvadym, 2015/03/25 16:34:07]

Sorry, I didn't realize that indenting was changed, fixed.

 
-IPC_ENUM_TRAITS_MAX_VALUE(autofill::WebElementDescriptor::RetrievalMethod,
-                          autofill::WebElementDescriptor::NONE)
+  IPC_ENUM_TRAITS_MAX_VALUE(autofill::WebElementDescriptor::RetrievalMethod,
+                            autofill::WebElementDescriptor::NONE)
 
-IPC_STRUCT_TRAITS_BEGIN(autofill::FormFieldData)
+  IPC_STRUCT_TRAITS_BEGIN(autofill::FormFieldData)
   IPC_STRUCT_TRAITS_MEMBER(label)
   IPC_STRUCT_TRAITS_MEMBER(name)
   IPC_STRUCT_TRAITS_MEMBER(value)
@@ -58,29 +59,29 @@ IPC_STRUCT_TRAITS_BEGIN(autofill::FormFieldData)
   IPC_STRUCT_TRAITS_MEMBER(text_direction)
   IPC_STRUCT_TRAITS_MEMBER(option_values)
   IPC_STRUCT_TRAITS_MEMBER(option_contents)
-IPC_STRUCT_TRAITS_END()
+  IPC_STRUCT_TRAITS_END()
 
-IPC_STRUCT_TRAITS_BEGIN(autofill::FormFieldDataPredictions)
+  IPC_STRUCT_TRAITS_BEGIN(autofill::FormFieldDataPredictions)
   IPC_STRUCT_TRAITS_MEMBER(field)
   IPC_STRUCT_TRAITS_MEMBER(signature)
   IPC_STRUCT_TRAITS_MEMBER(heuristic_type)
   IPC_STRUCT_TRAITS_MEMBER(server_type)
   IPC_STRUCT_TRAITS_MEMBER(overall_type)
-IPC_STRUCT_TRAITS_END()
+  IPC_STRUCT_TRAITS_END()
 
-IPC_STRUCT_TRAITS_BEGIN(autofill::FormDataPredictions)
+  IPC_STRUCT_TRAITS_BEGIN(autofill::FormDataPredictions)
   IPC_STRUCT_TRAITS_MEMBER(data)
   IPC_STRUCT_TRAITS_MEMBER(signature)
   IPC_STRUCT_TRAITS_MEMBER(experiment_id)
   IPC_STRUCT_TRAITS_MEMBER(fields)
-IPC_STRUCT_TRAITS_END()
+  IPC_STRUCT_TRAITS_END()
 
-IPC_STRUCT_TRAITS_BEGIN(autofill::UsernamesCollectionKey)
+  IPC_STRUCT_TRAITS_BEGIN(autofill::UsernamesCollectionKey)
   IPC_STRUCT_TRAITS_MEMBER(username)
   IPC_STRUCT_TRAITS_MEMBER(password)
-IPC_STRUCT_TRAITS_END()
+  IPC_STRUCT_TRAITS_END()
 
-IPC_STRUCT_TRAITS_BEGIN(autofill::PasswordFormFillData)
+  IPC_STRUCT_TRAITS_BEGIN(autofill::PasswordFormFillData)
   IPC_STRUCT_TRAITS_MEMBER(name)
   IPC_STRUCT_TRAITS_MEMBER(origin)
   IPC_STRUCT_TRAITS_MEMBER(action)
@@ -91,17 +92,19 @@ IPC_STRUCT_TRAITS_BEGIN(autofill::PasswordFormFillData)
   IPC_STRUCT_TRAITS_MEMBER(additional_logins)
   IPC_STRUCT_TRAITS_MEMBER(other_possible_usernames)
   IPC_STRUCT_TRAITS_MEMBER(wait_for_username)
-IPC_STRUCT_TRAITS_END()
+  IPC_STRUCT_TRAITS_END()
 
-IPC_STRUCT_TRAITS_BEGIN(autofill::PasswordAndRealm)
+  IPC_STRUCT_TRAITS_BEGIN(autofill::PasswordAndRealm)
   IPC_STRUCT_TRAITS_MEMBER(password)
   IPC_STRUCT_TRAITS_MEMBER(realm)
-IPC_STRUCT_TRAITS_END()
+  IPC_STRUCT_TRAITS_END()
 
-IPC_ENUM_TRAITS_MAX_VALUE(
-    blink::WebFormElement::AutocompleteResult,
-    blink::WebFormElement::AutocompleteResultErrorInvalid)
+  IPC_ENUM_TRAITS_MAX_VALUE(
+      blink::WebFormElement::AutocompleteResult,
+      blink::WebFormElement::AutocompleteResultErrorInvalid)
 
+  typedef std::map<autofill::FormData, autofill::FormFieldData>

[vabr (Chromium), 2015/03/25 10:12:33]

Indent these 2 lines 2 spaces to the left and add a blank line after line 107.

+      FormDataFieldDataMap;
 // Autofill messages sent from the browser to the renderer.
 
 // Tells the render frame that a user gesture was observed somewhere in the tab
@@ -195,6 +198,11 @@ IPC_MESSAGE_ROUTED3(AutofillMsg_RequestAutocompleteResult,
 IPC_MESSAGE_ROUTED1(AutofillMsg_AccountCreationFormsDetected,
                     std::vector<autofill::FormData> /* forms */)
 
+// Sent when Autofill manager gets the query response from the Autofill server
+// which contains information about username fields.

[vabr (Chromium), 2015/03/25 10:12:33]

"information about username fields" is maybe too vague. Could you add one
sentence explaining the meaning of the map? Something like:
|predictions| map forms to their username fields.

[dvadym, 2015/03/25 16:34:07]

Done.

+IPC_MESSAGE_ROUTED1(AutofillMsg_AutofillPasswordDataReceived,

[vabr (Chromium), 2015/03/25 10:12:33]

optional nit: AutofillPasswordDataReceived speaks about passwords, while the
comment above speaks about usernames. What about AutofillUsernameDataReceived?

[dvadym, 2015/03/25 16:34:07]

Done.

+                    FormDataFieldDataMap /* predictions */)
+
 // Autofill messages sent from the renderer to the browser.
 
 // TODO(creis): check in the browser that the renderer actually has permission