Layered component for web payments

components/payments/core/address_normalizer.h

Index: components/payments/core/address_normalizer.h
diff --git a/components/payments/address_normalizer.h b/components/payments/core/address_normalizer.h
similarity index 88%
rename from components/payments/address_normalizer.h
rename to components/payments/core/address_normalizer.h
index 34cac3cf3d24ec6f0f15abda5c9752c6c537ee12..0280d82b1e386d725c9900e70c98df4fbc51e245 100644
--- a/components/payments/address_normalizer.h
+++ b/components/payments/core/address_normalizer.h
@@ -2,14 +2,27 @@
 // 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 {
 
@@ -78,4 +91,4 @@ class AddressNormalizer : public autofill::LoadRulesListener {
 
 }  // namespace payments
 
-#endif  // COMPONENTS_PAYMENTS_ADDRESS_NORMALIZER_H_
+#endif  // COMPONENTS_PAYMENTS_CORE_ADDRESS_NORMALIZER_H_