Layered component for web payments

components/payments/content/android/currency_formatter_android.h

Index: components/payments/content/android/currency_formatter_android.h
diff --git a/components/payments/android/currency_formatter_android.h b/components/payments/content/android/currency_formatter_android.h
similarity index 84%
rename from components/payments/android/currency_formatter_android.h
rename to components/payments/content/android/currency_formatter_android.h
index f6e6b33e28f9c057edf87a951c947700bd75a6b5..9693c200b83a989119069e818c1f53c7cd81d21d 100644
--- a/components/payments/android/currency_formatter_android.h
+++ b/components/payments/content/android/currency_formatter_android.h
@@ -2,17 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_PAYMENTS_ANDROID_CURRENCY_FORMATTER_ANDROID_H_
-#define COMPONENTS_PAYMENTS_ANDROID_CURRENCY_FORMATTER_ANDROID_H_
+#ifndef COMPONENTS_PAYMENTS_CONTENT_ANDROID_CURRENCY_FORMATTER_ANDROID_H_
+#define COMPONENTS_PAYMENTS_CONTENT_ANDROID_CURRENCY_FORMATTER_ANDROID_H_
 
+#include <jni.h>
 #include <memory>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/macros.h"
-#include "components/payments/currency_formatter.h"
 
 namespace payments {
 
+class CurrencyFormatter;
+
 // Forwarding calls to payments::CurrencyFormatter.
 class CurrencyFormatterAndroid {
  public:
@@ -48,4 +50,4 @@ class CurrencyFormatterAndroid {
 
 }  // namespace payments
 
-#endif  // COMPONENTS_PAYMENTS_ANDROID_CURRENCY_FORMATTER_ANDROID_H_
+#endif  // COMPONENTS_PAYMENTS_CONTENT_ANDROID_CURRENCY_FORMATTER_ANDROID_H_