[Payments] Format shipping and billing phone number in normalizer.

components/payments/core/address_normalizer_unittest.cc

 // Copyright 2017 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/payments/core/address_normalizer.h"
 
 #include <utility>
 
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 15 matching lines @@
 using ::i18n::addressinput::TestdataSource;
 
 // The requester of normalization for this test.
 class NormalizationDelegate : public AddressNormalizer::Delegate {
  public:
   NormalizationDelegate()
       : normalized_called_(false), not_normalized_called_(false) {}
 
   ~NormalizationDelegate() override {}
 
-  void OnAddressNormalized(
-      const autofill::AutofillProfile& normalized_profile) override {
+  void OnAddressNormalized(const autofill::AutofillProfile& profile) override {
     normalized_called_ = true;
+    profile_ = profile;
   }
 
   void OnCouldNotNormalize(const autofill::AutofillProfile& profile) override {
     not_normalized_called_ = true;
+    profile_ = profile;
   }
 
   bool normalized_called() { return normalized_called_; }
 
   bool not_normalized_called() { return not_normalized_called_; }
 
+  AutofillProfile profile() { return profile_; }
+
  private:
   bool normalized_called_;
   bool not_normalized_called_;
+  AutofillProfile profile_;
 
   DISALLOW_COPY_AND_ASSIGN(NormalizationDelegate);
 };
 
 // Used to load region rules for this test.
 class ChromiumTestdataSource : public TestdataSource {
  public:
   ChromiumTestdataSource() : TestdataSource(true) {}
 
   ~ChromiumTestdataSource() override {}
@@ skipping 121 matching lines @@
 
   // Even if the rules are not loaded before the call to
   // StartAddressNormalization, they should get loaded in the call. Since our
   // test source is synchronous, the normalization will happen synchronously
   // too.
   EXPECT_TRUE(normalizer_->AreRulesLoadedForRegion("US"));
   EXPECT_TRUE(delegate.normalized_called());
   EXPECT_FALSE(delegate.not_normalized_called());
 }
 
+// Tests that the phone number is formatted when the address is normalized.
+TEST_F(AddressNormalizerTest, FormatPhone_AddressNormalized) {
+  NormalizationDelegate delegate;
+  AutofillProfile profile;
+  profile.SetRawInfo(autofill::PHONE_HOME_WHOLE_NUMBER,
+                     base::UTF8ToUTF16("5151231234"));
+
+  // Load the rules.
+  normalizer_->LoadRulesForRegion("US");
+  EXPECT_TRUE(normalizer_->AreRulesLoadedForRegion("US"));
+
+  // Start the normalization.
+  normalizer_->StartAddressNormalization(profile, "US", 0, &delegate);
+
+  // Make sure the address was normalized.
+  EXPECT_TRUE(delegate.normalized_called());
+
+  // Expect that the phone number was formatted.
+  EXPECT_EQ("+15151231234", base::UTF16ToUTF8(delegate.profile().GetRawInfo(
+                                autofill::PHONE_HOME_WHOLE_NUMBER)));
+}
+
+// Tests that the phone number is formatted even when the address is not
+// normalized.
+TEST_F(AddressNormalizerTest, FormatPhone_AddressNotNormalized) {
+  NormalizationDelegate delegate;
+  AutofillProfile profile;
+  profile.SetRawInfo(autofill::PHONE_HOME_WHOLE_NUMBER,
+                     base::UTF8ToUTF16("5151231234"));
+
+  // Make sure the rules will not be loaded in the StartAddressNormalization
+  // call.
+  normalizer_->ShouldLoadRules(false);
+
+  // Start the normalization.
+  normalizer_->StartAddressNormalization(profile, "US", 0, &delegate);
+
+  // Let the timeout execute.
+  base::RunLoop().RunUntilIdle();
+
+  // Make sure the address was not normalized.
+  EXPECT_TRUE(delegate.not_normalized_called());
+
+  // Expect that the phone number was formatted.
+  EXPECT_EQ("+15151231234", base::UTF16ToUTF8(delegate.profile().GetRawInfo(
+                                autofill::PHONE_HOME_WHOLE_NUMBER)));
+}
+
 }  // namespace payments