These changes *are* for review :)

chrome/browser/autofill/phone_number_i18n.cc

 // Copyright (c) 2011 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/phone_number_i18n.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/autofill/autofill_country.h"
 #include "third_party/libphonenumber/cpp/src/phonenumberutil.h"
 
 namespace {
 
 std::string SanitizeLocaleCode(const std::string& locale_code) {
   if (locale_code.length() == 2)
     return locale_code;
-  // Use USA for incomplete locales.
-  return std::string("US");
+  return AutofillCountry::CountryCodeForLocale(
+      AutofillCountry::ApplicationLocale());
 }
 
 i18n::phonenumbers::PhoneNumberUtil::PhoneNumberFormat UtilsTypeToPhoneLibType(
     autofill_i18n::FullPhoneFormat phone_format) {
   switch (phone_format) {
     case autofill_i18n::E164:
       return i18n::phonenumbers::PhoneNumberUtil::E164;
     case autofill_i18n::INTERNATIONAL:
       return i18n::phonenumbers::PhoneNumberUtil::INTERNATIONAL;
     case autofill_i18n::NATIONAL:
@@ skipping 124 matching lines @@
       return false;
   }
   if (country_int)
     i18n_number.set_country_code(country_int);
 
   i18n::phonenumbers::PhoneNumberUtil::ValidationResult validation =
       phone_util->IsPossibleNumberWithReason(i18n_number);
   if (validation != i18n::phonenumbers::PhoneNumberUtil::IS_POSSIBLE)
     return false;
 
+  // This verifies that number has a valid area code (that in some cases could
+  // be empty) for parsed country code. Also verifies that this is a valid
+  // number (in US 1234567 is not valid, because numbers do not start with 1).
+  if (!phone_util->IsValidNumber(i18n_number))
+    return false;
+
   std::string formatted_number;
 
   phone_util->Format(i18n_number, UtilsTypeToPhoneLibType(phone_format),
                      &formatted_number);
   *whole_number = UTF8ToUTF16(formatted_number);
   return true;
 }
 
 string16 FormatPhone(const string16& phone, const std::string& locale,
                      FullPhoneFormat phone_format) {
@@ skipping 58 matching lines @@
 }
 
 bool PhoneNumbersMatch(const string16& number_a,
                        const string16& number_b,
                        const std::string& country_code) {
   return ComparePhones(number_a, number_b, country_code) == PHONES_EQUAL;
 }
 
 }  // namespace autofill_i18n