Preserving first/middle/last names when an Autofill profile is submitted

chrome/browser/ui/webui/options/autofill_options_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options/autofill_options_handler.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 10 matching lines @@
 #include "base/values.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/autofill/country_combobox_model.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/autofill/content/browser/wallet/wallet_service_url.h"
 #include "components/autofill/core/browser/autofill_country.h"
+#include "components/autofill/core/browser/autofill_data_util.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/browser/phone_number_i18n.h"
 #include "components/autofill/core/common/autofill_constants.h"
 #include "components/autofill/core/common/autofill_switches.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/components_strings.h"
 #include "third_party/libaddressinput/messages.h"
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_ui.h"
@@ skipping 49 matching lines @@
                           const std::string& ui_language_code,
                           base::ListValue* address_components,
                           std::string* components_language_code) {
   DCHECK(address_components);
 
   i18n::addressinput::Localization localization;
   localization.SetGetter(l10n_util::GetStringUTF8);
   std::string not_used;
   std::vector<AddressUiComponent> components =
       i18n::addressinput::BuildComponents(
-          country_code,
-          localization,
-          ui_language_code,
-          components_language_code == NULL ?
-              &not_used : components_language_code);
+          country_code, localization, ui_language_code,
+          components_language_code == nullptr ? &not_used
+                                              : components_language_code);
   if (components.empty()) {
     static const char kDefaultCountryCode[] = "US";
     components = i18n::addressinput::BuildComponents(
-        kDefaultCountryCode,
-        localization,
-        ui_language_code,
-        components_language_code == NULL ?
-            &not_used : components_language_code);
+        kDefaultCountryCode, localization, ui_language_code,
+        components_language_code == nullptr ? &not_used
+                                            : components_language_code);
   }
   DCHECK(!components.empty());
 
-  base::ListValue* line = NULL;
+  base::ListValue* line = nullptr;
   static const char kField[] = "field";
   static const char kLength[] = "length";
   for (size_t i = 0; i < components.size(); ++i) {
     if (i == 0 ||
         components[i - 1].length_hint == AddressUiComponent::HINT_LONG ||
         components[i].length_hint == AddressUiComponent::HINT_LONG) {
       line = new base::ListValue;
       address_components->Append(line);
     }
 
@@ skipping 74 matching lines @@
   localized_strings->Set("autofillDefaultCountryComponents",
                          default_country_components.release());
   localized_strings->SetString("autofillDefaultCountryLanguageCode",
                                default_country_language_code);
 }
 
 }  // namespace
 
 namespace options {
 
-AutofillOptionsHandler::AutofillOptionsHandler() : personal_data_(NULL) {}
+AutofillOptionsHandler::AutofillOptionsHandler()
+    : personal_data_(nullptr), prior_profile_(nullptr) {}
 
 AutofillOptionsHandler::~AutofillOptionsHandler() {
   if (personal_data_)
     personal_data_->RemoveObserver(this);
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // OptionsPageUIHandler implementation:
 void AutofillOptionsHandler::GetLocalizedValues(
     base::DictionaryValue* localized_strings) {
@@ skipping 165 matching lines @@
 
 void AutofillOptionsHandler::LoadAddressEditor(const base::ListValue* args) {
   DCHECK(IsPersonalDataLoaded());
 
   std::string guid;
   if (!args->GetString(0, &guid)) {
     NOTREACHED();
     return;
   }
 
-  AutofillProfile* profile = personal_data_->GetProfileByGUID(guid);
-  if (!profile) {
+  prior_profile_ = personal_data_->GetProfileByGUID(guid);
+  if (!prior_profile_) {
     // There is a race where a user can click once on the close button and
     // quickly click again on the list item before the item is removed (since
     // the list is not updated until the model tells the list an item has been
     // removed). This will activate the editor for a profile that has been
     // removed. Do nothing in that case.
     return;
   }
 
   base::DictionaryValue address;
-  AutofillProfileToDictionary(*profile, &address);
+  AutofillProfileToDictionary(*prior_profile_, &address);
 
   web_ui()->CallJavascriptFunction("AutofillOptions.editAddress", address);
 }
 
 void AutofillOptionsHandler::LoadAddressEditorComponents(
     const base::ListValue* args) {
   std::string country_code;
   if (!args->GetString(0, &country_code)) {
     NOTREACHED();
     return;
@@ skipping 54 matching lines @@
 
   int arg_counter = 0;
   std::string guid;
   if (!args->GetString(arg_counter++, &guid)) {
     NOTREACHED();
     return;
   }
 
   AutofillProfile profile(guid, kSettingsOrigin);
 
-  base::string16 value;
-  if (args->GetString(arg_counter++, &value)) {
-    profile.SetInfo(AutofillType(autofill::NAME_FULL), value,
-                    g_browser_process->GetApplicationLocale());
+  base::string16 full_name;
+  if (args->GetString(arg_counter++, &full_name)) {
+    // Although First/Middle/Last are not displayed on the form, we transfer
+    // this
+    // information when they match the full name given. This is because it may

[Mathieu, 2016/04/13 18:12:24]

nit: line wrapping got weird here!

[tmartino, 2016/04/13 19:43:25]

git cl format is not as smart as I thought it was. Fixed.

+    // not
+    // be possible later to correctly tokenize the concatenated full name--e.g.,
+    // when the last name contains a space, the first word would be treated as a
+    // middle name.
+    if (prior_profile_ && autofill::data_util::ProfileMatchesFullName(
+                              full_name, *prior_profile_)) {
+      profile.SetRawInfo(autofill::NAME_FULL, full_name);
+
+      profile.SetRawInfo(autofill::NAME_FIRST,
+                         prior_profile_->GetRawInfo(autofill::NAME_FIRST));
+      profile.SetRawInfo(autofill::NAME_MIDDLE,
+                         prior_profile_->GetRawInfo(autofill::NAME_MIDDLE));
+      profile.SetRawInfo(autofill::NAME_LAST,
+                         prior_profile_->GetRawInfo(autofill::NAME_LAST));
+    } else {
+      // In contrast to SetRawInfo, SetInfo will naively attempt to populate the
+      // First/Middle/Last fields by tokenization.
+      profile.SetInfo(AutofillType(autofill::NAME_FULL), full_name,
+                      g_browser_process->GetApplicationLocale());
+    }
   }
 
+  base::string16 value;
   if (args->GetString(arg_counter++, &value))
     profile.SetRawInfo(autofill::COMPANY_NAME, value);
 
   if (args->GetString(arg_counter++, &value))
     profile.SetRawInfo(autofill::ADDRESS_HOME_STREET_ADDRESS, value);
 
   if (args->GetString(arg_counter++, &value))
     profile.SetRawInfo(autofill::ADDRESS_HOME_DEPENDENT_LOCALITY, value);
 
   if (args->GetString(arg_counter++, &value))
@@ skipping 102 matching lines @@
   address->SetString(kCountryField,
                      profile.GetRawInfo(autofill::ADDRESS_HOME_COUNTRY));
   address->SetString("phone",
                      profile.GetRawInfo(autofill::PHONE_HOME_WHOLE_NUMBER));
   address->SetString("email", profile.GetRawInfo(autofill::EMAIL_ADDRESS));
   address->SetString(kLanguageCode, profile.language_code());
 
   scoped_ptr<base::ListValue> components(new base::ListValue);
   GetAddressComponents(
       base::UTF16ToUTF8(profile.GetRawInfo(autofill::ADDRESS_HOME_COUNTRY)),
-      profile.language_code(),
-      components.get(),
-      NULL);
+      profile.language_code(), components.get(), nullptr);
   address->Set(kComponents, components.release());
 }
 
 }  // namespace options