Fill in more name fields with requestAutocomplete

components/autofill/core/browser/contact_info.h

Index: components/autofill/core/browser/contact_info.h
diff --git a/components/autofill/core/browser/contact_info.h b/components/autofill/core/browser/contact_info.h
index 007be1be81f5ebb2e5fecb3c8d23aa9f583f962e..da5f883fc6780c6d2a0a0299f6cdeda5953299fa 100644
--- a/components/autofill/core/browser/contact_info.h
+++ b/components/autofill/core/browser/contact_info.h
@@ -33,25 +33,21 @@ class NameInfo : public FormGroup {
   virtual void GetSupportedTypes(
       ServerFieldTypeSet* supported_types) const OVERRIDE;
 
-  // Returns the full name, which can include up to the first, middle, and last
-  // name.
+  // Returns the full name, which is either |full_|, or if |full_| is empty,
+  // is composed of given, middle and family.
   base::string16 FullName() const;
 
   // Returns the middle initial if |middle_| is non-empty.  Returns an empty
   // string otherwise.
   base::string16 MiddleInitial() const;
 
-  const base::string16& first() const { return first_; }
-  const base::string16& middle() const { return middle_; }
-  const base::string16& last() const { return last_; }
-
-  // Sets |first_|, |middle_|, and |last_| to the tokenized |full|.
-  // It is tokenized on a space only.
+  // Sets |given_|, |middle_|, and |family_| to the tokenized |full|.
   void SetFullName(const base::string16& full);
 
-  base::string16 first_;
+  base::string16 given_;
   base::string16 middle_;
-  base::string16 last_;
+  base::string16 family_;
+  base::string16 full_;
 };
 
 class EmailInfo : public FormGroup {