[Autofill] Ensure that clients pass the correct region info when parsing phone numbers.

chrome/browser/autofill/autofill_ie_toolbar_import_win.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/autofill/autofill_ie_toolbar_import_win.h"
 
 #include <stddef.h>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/string16.h"
 #include "base/win/registry.h"
+#include "chrome/browser/autofill/autofill_country.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/autofill/crypto/rc4_decryptor.h"
 #include "chrome/browser/autofill/field_types.h"
 #include "chrome/browser/autofill/form_group.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/autofill/personal_data_manager_observer.h"
 #include "chrome/browser/autofill/phone_number.h"
 #include "chrome/browser/autofill/phone_number_i18n.h"
 #include "sync/util/data_encryption_win.h"
@@ skipping 31 matching lines @@
   // Empty salt in IE Toolbar is \x1\x2...\x14
   if (salt.length() != 20)
     return false;
   for (size_t i = 0; i < salt.length(); ++i) {
     if (salt[i] != i + 1)
       return false;
   }
   return true;
 }
 
-string16 ReadAndDecryptValue(RegKey* key, const wchar_t* value_name) {
+string16 ReadAndDecryptValue(const RegKey& key, const wchar_t* value_name) {
   DWORD data_type = REG_BINARY;
   DWORD data_size = 0;
-  LONG result = key->ReadValue(value_name, NULL, &data_size, &data_type);
+  LONG result = key.ReadValue(value_name, NULL, &data_size, &data_type);
   if ((result != ERROR_SUCCESS) || !data_size || data_type != REG_BINARY)
     return string16();
   std::vector<uint8> data;
   data.resize(data_size);
-  result = key->ReadValue(value_name, &(data[0]), &data_size, &data_type);
+  result = key.ReadValue(value_name, &(data[0]), &data_size, &data_type);
   if (result == ERROR_SUCCESS) {
     std::string out_data;
     if (syncer::DecryptData(data, &out_data)) {
       // The actual data is in UTF16 already.
       if (!(out_data.size() & 1) && (out_data.size() > 2) &&
           !out_data[out_data.size() - 1] && !out_data[out_data.size() - 2]) {
         return string16(
             reinterpret_cast<const wchar_t *>(out_data.c_str()));
       }
     }
@@ skipping 29 matching lines @@
   { CREDIT_CARD_NAME,              L"credit_card_name" },
   { CREDIT_CARD_NUMBER,            L"credit_card_number" },
   { CREDIT_CARD_EXP_MONTH,         L"credit_card_exp_month" },
   { CREDIT_CARD_EXP_4_DIGIT_YEAR,  L"credit_card_exp_4_digit_year" },
   { CREDIT_CARD_TYPE,              L"credit_card_type" },
   // We do not import verification code.
 };
 
 typedef std::map<std::wstring, AutofillFieldType> RegToFieldMap;
 
-bool ImportSingleProfile(FormGroup* profile,
-                         RegKey* key,
-                         const RegToFieldMap& reg_to_field ) {
-  DCHECK(profile != NULL);
-  if (!key->Valid())
+// Imports address or credit card data from the given registry |key| into the
+// given |form_group|, with the help of |reg_to_field|.  When importing address
+// data, writes the phone data into |phone|; otherwise, |phone| should be null.
+// Returns true if any fields were set, false otherwise.
+bool ImportSingleFormGroup(const RegKey& key,
+                           const RegToFieldMap& reg_to_field,
+                           FormGroup* form_group,
+                           PhoneNumber::PhoneCombineHelper* phone) {
+  if (!key.Valid())
     return false;
 
   bool has_non_empty_fields = false;
 
-  // Phones need to be rebuilt.
-  PhoneNumber::PhoneCombineHelper phone;
+  for (uint32 i = 0; i < key.GetValueCount(); ++i) {
+    std::wstring value_name;
+    if (key.GetValueNameAt(i, &value_name) != ERROR_SUCCESS)
+      continue;
 
-  for (uint32 i = 0; i < key->GetValueCount(); ++i) {
-    std::wstring value_name;
-    if (key->GetValueNameAt(i, &value_name) != ERROR_SUCCESS)
-      continue;
     RegToFieldMap::const_iterator it = reg_to_field.find(value_name);
     if (it == reg_to_field.end())
       continue;  // This field is not imported.
+
     string16 field_value = ReadAndDecryptValue(key, value_name.c_str());
     if (!field_value.empty()) {
-      has_non_empty_fields = true;
       if (it->second == CREDIT_CARD_NUMBER)
         field_value = DecryptCCNumber(field_value);
 
-      // We need to store phone data in |phone| before building the whole number
-      // at the end. The rest of the fields are set "as is".
+      // Phone numbers are stored piece-by-piece, and then reconstructed from
+      // the pieces.  The rest of the fields are set "as is".
       // TODO(isherman): Call SetInfo(), rather than SetRawInfo().
-      if (!phone.SetInfo(it->second, field_value))
-        profile->SetRawInfo(it->second, field_value);
+      if (!phone || !phone->SetInfo(it->second, field_value)) {
+        has_non_empty_fields = true;
+        form_group->SetRawInfo(it->second, field_value);
+      }
     }
   }
+
+  return has_non_empty_fields;
+}
+
+// Imports address data from the given registry |key| into the given |profile|,
+// with the help of |reg_to_field|.  Returns true if any fields were set, false
+// otherwise.
+bool ImportSingleProfile(const RegKey& key,
+                         const RegToFieldMap& reg_to_field,
+                         AutofillProfile* profile) {
+  PhoneNumber::PhoneCombineHelper phone;
+  bool has_non_empty_fields =
+      ImportSingleFormGroup(key, reg_to_field, profile, &phone);
+
   // Now re-construct the phones if needed.
   string16 constructed_number;
-  if (!phone.IsEmpty() &&
-      phone.ParseNumber(std::string("US"), &constructed_number)) {
+  const std::string app_locale = AutofillCountry::ApplicationLocale();
+  if (phone.ParseNumber(*profile, app_locale, &constructed_number)) {
+    has_non_empty_fields = true;
     profile->SetRawInfo(PHONE_HOME_WHOLE_NUMBER, constructed_number);
   }
 
   return has_non_empty_fields;
 }
 
 // Imports profiles from the IE toolbar and stores them. Asynchronous
 // if PersonalDataManager has not been loaded yet. Deletes itself on completion.
 class AutofillImporter : public PersonalDataManagerObserver {
  public:
@@ skipping 53 matching lines @@
   }
 
   base::win::RegistryKeyIterator iterator_profiles(HKEY_CURRENT_USER,
                                                    kProfileKey);
   for (; iterator_profiles.Valid(); ++iterator_profiles) {
     std::wstring key_name(kProfileKey);
     key_name.append(L"\\");
     key_name.append(iterator_profiles.Name());
     RegKey key(HKEY_CURRENT_USER, key_name.c_str(), KEY_READ);
     AutofillProfile profile;
-    if (ImportSingleProfile(&profile, &key, reg_to_field)) {
+    if (ImportSingleProfile(key, reg_to_field, &profile)) {
       // Combine phones into whole phone #.
       profiles->push_back(profile);
     }
   }
   string16 password_hash;
   string16 salt;
   RegKey cc_key(HKEY_CURRENT_USER, kCreditCardKey, KEY_READ);
   if (cc_key.Valid()) {
-    password_hash = ReadAndDecryptValue(&cc_key, kPasswordHashValue);
-    salt = ReadAndDecryptValue(&cc_key, kSaltValue);
+    password_hash = ReadAndDecryptValue(cc_key, kPasswordHashValue);
+    salt = ReadAndDecryptValue(cc_key, kSaltValue);
   }
 
   // We import CC profiles only if they are not password protected.
   if (password_hash.empty() && IsEmptySalt(salt)) {
     base::win::RegistryKeyIterator iterator_cc(HKEY_CURRENT_USER,
                                                kCreditCardKey);
     for (; iterator_cc.Valid(); ++iterator_cc) {
       std::wstring key_name(kCreditCardKey);
       key_name.append(L"\\");
       key_name.append(iterator_cc.Name());
       RegKey key(HKEY_CURRENT_USER, key_name.c_str(), KEY_READ);
       CreditCard credit_card;
-      if (ImportSingleProfile(&credit_card, &key, reg_to_field)) {
+      if (ImportSingleFormGroup(key, reg_to_field, &credit_card, NULL)) {
         // TODO(isherman): Call into GetInfo() below, rather than GetRawInfo().
         string16 cc_number = credit_card.GetRawInfo(CREDIT_CARD_NUMBER);
         if (!cc_number.empty())
           credit_cards->push_back(credit_card);
       }
     }
   }
   return (profiles->size() + credit_cards->size()) > 0;
 }
 
 bool ImportAutofillDataWin(PersonalDataManager* pdm) {
   // In incognito mode we do not have PDM - and we should not import anything.
   if (!pdm)
     return false;
   AutofillImporter *importer = new AutofillImporter(pdm);
   // importer will self delete.
   return importer->ImportProfiles();
 }