Change PhoneNumber::SetInfo to only apply formatting where there is none

components/autofill/core/browser/phone_number_i18n.cc

Index: components/autofill/core/browser/phone_number_i18n.cc
diff --git a/components/autofill/core/browser/phone_number_i18n.cc b/components/autofill/core/browser/phone_number_i18n.cc
index 72b2e1f481849956d8091f5bc9adb460ff4ddc0c..7285252162d005acbc03c8ee9f75f383a0e9d877 100644
--- a/components/autofill/core/browser/phone_number_i18n.cc
+++ b/components/autofill/core/browser/phone_number_i18n.cc
@@ -141,9 +141,8 @@ bool ParsePhoneNumber(const base::string16& value,
   if (i18n_number->has_country_code()) {
     *country_code = base::UTF8ToUTF16(
         base::StringPrintf("%d", i18n_number->country_code()));
-    if (normalized_number.length() <= national_significant_number.length() &&

[Evan Stade, 2014/07/10 23:22:48]

I don't know what the purpose of this check was. The effect was that a German
number:

08 450 777-777

would have a country code prepended simply because the normalized number
contains the trunk code (0):

08450777777

and therefore the normalized number is longer than the
national_significant_number, which is just

8450777777

[Ilya Sherman, 2014/07/11 01:11:01]

I'm also not sure.  I guess if no tests fail, then it's hard to claim that this
change is not appropriate.  I wish the terminology around phone numbers were a
little more intuitively grokable... oh well.

[Evan Stade, 2014/07/11 18:08:13]

well, tests did fail, which caused me to look into this more and I found a
better way of checking where the country code came from.

-        !StartsWith(normalized_number, *country_code,
-                    true /* case_sensitive */)) {
+    if (!StartsWith(
+            normalized_number, *country_code, true /* case_sensitive */)) {
       country_code->clear();
     }
   }