PaymentApp: Add PaymentAppProvider class.

chrome/browser/android/payments/service_worker_payment_app_bridge.cc

Index: chrome/browser/android/payments/service_worker_payment_app_bridge.cc
diff --git a/chrome/browser/android/payments/service_worker_payment_app_bridge.cc b/chrome/browser/android/payments/service_worker_payment_app_bridge.cc
index 9ab20a3d8058a99f1baf4d338d141fcdb47fe142..9ea58f1cf33c3a2ddb2fe77a6d72502f40e25a7b 100644
--- a/chrome/browser/android/payments/service_worker_payment_app_bridge.cc
+++ b/chrome/browser/android/payments/service_worker_payment_app_bridge.cc
@@ -10,7 +10,7 @@
 #include "components/payments/payment_app.mojom.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/payment_app_context.h"
+#include "content/public/browser/payment_app_provider.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/ServiceWorkerPaymentAppBridge_jni.h"
@@ -26,7 +26,7 @@ namespace {
 
 void OnGotAllManifests(const JavaRef<jobject>& jweb_contents,
                        const JavaRef<jobject>& jcallback,
-                       content::PaymentAppContext::Manifests manifests) {
+                       content::PaymentAppProvider::Manifests manifests) {
   JNIEnv* env = AttachCurrentThread();
 
   for (const auto& entry : manifests) {
@@ -67,17 +67,11 @@ static void GetAllAppManifests(JNIEnv* env,
   content::WebContents* web_contents =
       content::WebContents::FromJavaWebContents(jweb_contents);
 
-  content::BrowserContext* browser_context = web_contents->GetBrowserContext();
-
-  content::StoragePartition* storage_partition =
-      content::BrowserContext::GetDefaultStoragePartition(browser_context);
-
-  content::PaymentAppContext* payment_app_context =
-      storage_partition->GetPaymentAppContext();
-
-  payment_app_context->GetAllManifests(base::Bind(
-      &OnGotAllManifests, ScopedJavaGlobalRef<jobject>(env, jweb_contents),
-      ScopedJavaGlobalRef<jobject>(env, jcallback)));
+  content::PaymentAppProvider::GetInstance()->GetAllManifests(
+      web_contents->GetBrowserContext(),
+      base::Bind(&OnGotAllManifests,
+                 ScopedJavaGlobalRef<jobject>(env, jweb_contents),
+                 ScopedJavaGlobalRef<jobject>(env, jcallback)));
 }
 
 static void InvokePaymentApp(JNIEnv* env,