Layered component for web payments

components/payments/core/address_normalizer.h

 // 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.
 
-#ifndef COMPONENTS_PAYMENTS_ADDRESS_NORMALIZER_H_
-#define COMPONENTS_PAYMENTS_ADDRESS_NORMALIZER_H_
+#ifndef COMPONENTS_PAYMENTS_CORE_ADDRESS_NORMALIZER_H_
+#define COMPONENTS_PAYMENTS_CORE_ADDRESS_NORMALIZER_H_
+
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 
 #include "base/macros.h"
-#include "components/autofill/core/browser/autofill_profile.h"
 #include "third_party/libaddressinput/chromium/chrome_address_validator.h"
 
-using autofill::AutofillProfile;
+namespace autofill {
+class AutofillProfile;
+}
+
+namespace i18n {
+namespace libadderssinput {
+class Source;
+class Storage;
+}
+}
 
 namespace payments {
 
 // A class used to normalize addresses.
 class AddressNormalizer : public autofill::LoadRulesListener {
  public:
   // The interface for the normalization delegates.
   class Delegate {
    public:
     virtual void OnAddressNormalized(
@@ skipping 48 matching lines @@
       pending_normalization_;
 
   // The address validator used to normalize addresses.
   autofill::AddressValidator address_validator_;
 
   DISALLOW_COPY_AND_ASSIGN(AddressNormalizer);
 };
 
 }  // namespace payments
 
-#endif  // COMPONENTS_PAYMENTS_ADDRESS_NORMALIZER_H_
+#endif  // COMPONENTS_PAYMENTS_CORE_ADDRESS_NORMALIZER_H_