PaymentApp: Factor out functions to serialize/deserialize manifest data.

content/browser/payments/payment_app_manager.cc

Index: content/browser/payments/payment_app_manager.cc
diff --git a/content/browser/payments/payment_app_manager.cc b/content/browser/payments/payment_app_manager.cc
index bf3008a5aa9e3dea98b66d0d10f75c1ea2c334ad..794da26d432773127728c8ee34018d5d6f398073 100644
--- a/content/browser/payments/payment_app_manager.cc
+++ b/content/browser/payments/payment_app_manager.cc
@@ -8,7 +8,7 @@
 
 #include "base/bind.h"
 #include "base/optional.h"
-#include "content/browser/payments/payment_app_context.h"
+#include "content/browser/payments/payment_app_context_impl.h"
 #include "content/browser/payments/payment_app_data_conversions.h"
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
 #include "content/browser/service_worker/service_worker_registration.h"
@@ -26,7 +26,7 @@ PaymentAppManager::~PaymentAppManager() {
 }
 
 PaymentAppManager::PaymentAppManager(
-    PaymentAppContext* payment_app_context,
+    PaymentAppContextImpl* payment_app_context,
     mojo::InterfaceRequest<payments::mojom::PaymentAppManager> request)
     : payment_app_context_(payment_app_context),
       binding_(this, std::move(request)),