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..d8d6d4997900988aa162876d787c4785b36b2b19 100644
--- a/components/autofill/core/browser/contact_info.h
+++ b/components/autofill/core/browser/contact_info.h
@@ -41,17 +41,13 @@ class NameInfo : public FormGroup {
   // 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_name_;
 };
 
 class EmailInfo : public FormGroup {