Make payment manifest download/parse cross-platform

components/payments/content/android/payment_manifest_parser_android.cc

Index: components/payments/content/android/payment_manifest_parser_android.cc
diff --git a/components/payments/content/android/payment_manifest_parser_android.cc b/components/payments/content/android/payment_manifest_parser_android.cc
index fbc10564b6473e90895fc27654cecd7158b642f5..012d9eadc9d3423be3e0b031fa17a7bcefb74d6f 100644
--- a/components/payments/content/android/payment_manifest_parser_android.cc
+++ b/components/payments/content/android/payment_manifest_parser_android.cc
@@ -11,29 +11,30 @@
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
-#include "base/bind_helpers.h"
-#include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/numerics/safe_conversions.h"
-#include "components/strings/grit/components_strings.h"
-#include "content/public/browser/utility_process_mojo_client.h"
 #include "jni/PaymentManifestParser_jni.h"
-#include "ui/base/l10n/l10n_util.h"
 
 namespace payments {
+namespace {
 
-class PaymentManifestParserAndroid::ParseCallback {
+class ParseCallback {
  public:
   explicit ParseCallback(const base::android::JavaParamRef<jobject>& jcallback)
       : jcallback_(jcallback) {}
 
   ~ParseCallback() {}
 
-  void OnManifestParseSuccess(
+  void OnManifestParsed(
       std::vector<mojom::PaymentManifestSectionPtr> manifest) {
-    DCHECK(!manifest.empty());
-
     JNIEnv* env = base::android::AttachCurrentThread();
+
+    if (manifest.empty()) {
+      // Can trigger synchronous deletion of PaymentManifestParserAndroid.
+      Java_ManifestParseCallback_onManifestParseFailure(env, jcallback_);
+      return;
+    }
+
     base::android::ScopedJavaLocalRef<jobjectArray> jmanifest =
         Java_PaymentManifestParser_createManifest(env, manifest.size());
 
@@ -69,18 +70,14 @@ class PaymentManifestParserAndroid::ParseCallback {
                                                       jmanifest.obj());
   }
 
-  void OnManifestParseFailure() {
-    // Can trigger synchronous deletion of PaymentManifestParserAndroid.
-    Java_ManifestParseCallback_onManifestParseFailure(
-        base::android::AttachCurrentThread(), jcallback_);
-  }
-
  private:
   base::android::ScopedJavaGlobalRef<jobject> jcallback_;
 
   DISALLOW_COPY_AND_ASSIGN(ParseCallback);
 };
 
+}  // namespace
+
 PaymentManifestParserAndroid::PaymentManifestParserAndroid() {}
 
 PaymentManifestParserAndroid::~PaymentManifestParserAndroid() {}
@@ -88,13 +85,7 @@ PaymentManifestParserAndroid::~PaymentManifestParserAndroid() {}
 void PaymentManifestParserAndroid::StartUtilityProcess(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& jcaller) {
-  mojo_client_ = base::MakeUnique<
-      content::UtilityProcessMojoClient<mojom::PaymentManifestParser>>(
-      l10n_util::GetStringUTF16(IDS_UTILITY_PROCESS_MANIFEST_PARSER_NAME));
-  mojo_client_->set_error_callback(
-      base::Bind(&PaymentManifestParserAndroid::OnUtilityProcessStopped,
-                 base::Unretained(this)));
-  mojo_client_->Start();
+  host_.StartUtilityProcess();
 }
 
 void PaymentManifestParserAndroid::ParsePaymentManifest(
@@ -102,22 +93,10 @@ void PaymentManifestParserAndroid::ParsePaymentManifest(
     const base::android::JavaParamRef<jobject>& jcaller,
     const base::android::JavaParamRef<jstring>& jcontent,
     const base::android::JavaParamRef<jobject>& jcallback) {
-  std::unique_ptr<ParseCallback> pending_callback =
-      base::MakeUnique<ParseCallback>(jcallback);
-
-  if (!mojo_client_) {
-    pending_callback->OnManifestParseFailure();
-    return;
-  }
-
-  ParseCallback* callback_identifier = pending_callback.get();
-  pending_callbacks_.push_back(std::move(pending_callback));
-  DCHECK_GE(10U, pending_callbacks_.size());
-
-  mojo_client_->service()->Parse(
+  host_.ParsePaymentManifest(
       base::android::ConvertJavaStringToUTF8(env, jcontent),
-      base::Bind(&PaymentManifestParserAndroid::OnParse, base::Unretained(this),
-                 callback_identifier));
+      base::BindOnce(&ParseCallback::OnManifestParsed,
+                     base::MakeUnique<ParseCallback>(jcallback)));
 }
 
 void PaymentManifestParserAndroid::StopUtilityProcess(
@@ -126,42 +105,6 @@ void PaymentManifestParserAndroid::StopUtilityProcess(
   delete this;
 }
 
-void PaymentManifestParserAndroid::OnParse(
-    ParseCallback* callback_identifier,
-    std::vector<mojom::PaymentManifestSectionPtr> manifest) {
-  // At most 10 manifests to parse, so iterating a vector is not too slow.
-  for (auto it = pending_callbacks_.begin(); it != pending_callbacks_.end();
-       ++it) {
-    if (it->get() == callback_identifier) {
-      std::unique_ptr<ParseCallback> pending_callback = std::move(*it);
-      pending_callbacks_.erase(it);
-
-      // Can trigger synchronous deletion of this object, so can't access any of
-      // the member variables after this block.
-      if (manifest.empty())
-        pending_callback->OnManifestParseFailure();
-      else
-        pending_callback->OnManifestParseSuccess(std::move(manifest));
-      return;
-    }
-  }
-
-  // If unable to find the pending callback, then something went wrong in the
-  // utility process. Stop the utility process and notify all callbacks.
-  OnUtilityProcessStopped();
-}
-
-void PaymentManifestParserAndroid::OnUtilityProcessStopped() {
-  mojo_client_.reset();
-  std::vector<std::unique_ptr<ParseCallback>> callbacks =
-      std::move(pending_callbacks_);
-  for (const auto& callback : callbacks) {
-    // Can trigger synchronous deletion of this object, so can't access any of
-    // the member variables after this line.
-    callback->OnManifestParseFailure();
-  }
-}
-
 bool RegisterPaymentManifestParser(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }