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

components/autofill/core/browser/phone_number_i18n.cc

 // Copyright 2013 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 "components/autofill/core/browser/phone_number_i18n.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 123 matching lines @@
   *country_code = base::string16();
 
   phone_util->NormalizeDigitsOnly(&number_text);
   base::string16 normalized_number(base::UTF8ToUTF16(number_text));
 
   // Check if parsed number has a country code that was not inferred from the
   // region.
   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();
     }
   }
 
   // The region might be different from what we started with.
   phone_util->GetRegionCodeForNumber(*i18n_number, inferred_region);
 
   return true;
 }
 
@@ skipping 143 matching lines @@
   number_ = other.number_;
 
   formatted_number_ = other.formatted_number_;
   whole_number_ = other.whole_number_;
 
   return *this;
 }
 
 }  // namespace i18n
 }  // namespace autofill