Rescoping prior profile data in Autofill settings to correct regression.

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 186 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_(nullptr), prior_profile_(nullptr) {}
+AutofillOptionsHandler::AutofillOptionsHandler() : personal_data_(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;
   }
 
-  prior_profile_ = personal_data_->GetProfileByGUID(guid);
-  if (!prior_profile_) {
+  const AutofillProfile* 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(*prior_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 57 matching lines @@
   if (!args->GetString(arg_counter++, &guid)) {
     NOTREACHED();
     return;
   }
 
   AutofillProfile profile(guid, kSettingsOrigin);
 
   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 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_)) {
+    // this information when they match the full name in the old version of the
+    // profile, if one exists. This is because it may 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.
+    const AutofillProfile* prior_profile =
+        base::IsValidGUID(profile.guid())
+            ? personal_data_->GetProfileByGUID(guid)
+            : nullptr;
+
+    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));
+                         prior_profile->GetRawInfo(autofill::NAME_FIRST));
       profile.SetRawInfo(autofill::NAME_MIDDLE,
-                         prior_profile_->GetRawInfo(autofill::NAME_MIDDLE));
+                         prior_profile->GetRawInfo(autofill::NAME_MIDDLE));
       profile.SetRawInfo(autofill::NAME_LAST,
-                         prior_profile_->GetRawInfo(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))
@@ skipping 116 matching lines @@
   address->SetString(kLanguageCode, profile.language_code());
 
   std::unique_ptr<base::ListValue> components(new base::ListValue);
   GetAddressComponents(
       base::UTF16ToUTF8(profile.GetRawInfo(autofill::ADDRESS_HOME_COUNTRY)),
       profile.language_code(), components.get(), nullptr);
   address->Set(kComponents, components.release());
 }
 
 }  // namespace options