Reland: Normalize shipping address for merchant on Desktop.

components/payments/core/address_normalizer_impl_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 "components/payments/core/address_normalizer_impl.h"
 
 #include <utility>
 
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/scoped_task_scheduler.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/null_storage.h"
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/source.h"
@@ skipping 56 matching lines @@
         true, key,
         new std::string("{\"data/US\": "
                         "{\"id\":\"data/US\",\"key\":\"US\",\"name\":\"UNITED "
                         "STATES\",\"lang\":\"en\",\"languages\":\"en\"}}"));
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ChromiumTestdataSource);
 };
 
-// A test subclass of the AddressNormalizer. Used to simulate rules not being
-// loaded.
-class TestAddressNormalizer : public AddressNormalizer {
+// A test subclass of the AddressNormalizerImpl. Used to simulate rules not
+// being loaded.
+class TestAddressNormalizer : public AddressNormalizerImpl {
  public:
   TestAddressNormalizer(std::unique_ptr<::i18n::addressinput::Source> source,
                         std::unique_ptr<::i18n::addressinput::Storage> storage)
-      : AddressNormalizer(std::move(source), std::move(storage)),
+      : AddressNormalizerImpl(std::move(source), std::move(storage)),
         should_load_rules_(true) {}
 
   ~TestAddressNormalizer() override {}
 
   void ShouldLoadRules(bool should_load_rules) {
     should_load_rules_ = should_load_rules;
   }
 
   void LoadRulesForRegion(const std::string& region_code) override {
     if (should_load_rules_) {
-      AddressNormalizer::LoadRulesForRegion(region_code);
+      AddressNormalizerImpl::LoadRulesForRegion(region_code);
     }
   }
 
  private:
   bool should_load_rules_;
 
   DISALLOW_COPY_AND_ASSIGN(TestAddressNormalizer);
 };
 
 }  // namespace
@@ skipping 128 matching lines @@
 
   // 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