[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 123 matching lines @@
 
       // 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".
       // TODO(isherman): Call SetInfo(), rather than SetRawInfo().
       if (!phone.SetInfo(it->second, field_value))
         profile->SetRawInfo(it->second, field_value);
     }
   }
   // 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(),

[dhollowa, 2013/01/09 01:26:54]

win compile problem.

[Ilya Sherman, 2013/01/09 01:29:10]

Whoops.  Fixed.

+  if (phone.ParseNumber(*profile, app_locale, &constructed_number))
     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:
   explicit AutofillImporter(PersonalDataManager* personal_data_manager)
     : personal_data_manager_(personal_data_manager) {
@@ skipping 93 matching lines @@
 }
 
 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();
 }