service worker: Remove Payment handling from the test helper

Move On*Event(Stub) functions from EmbeddedWorkerTestHelper to
FakeServiceWorker.

Bug: 934665
Change-Id: I44bd5b26ebf0a3672c785fb2433a46a2f1a451a3
Reviewed-on: https://chromium-review.googlesource.com/c/1484406
Commit-Queue: Matt Falkenhagen <falken@chromium.org>
Reviewed-by: Matt Falkenhagen <falken@chromium.org>
Reviewed-by: Jinho Bang <jinho.bang@samsung.com>
Auto-Submit: Amos Lim <eui-sang.lim@samsung.com>
Cr-Commit-Position: refs/heads/master@{#635770}

content/browser/payments/payment_app_content_unittest_base.cc

@@ -93,6 +93,22 @@ class PaymentAppContentUnitTestBase::PaymentAppForWorkerTestHelper
         : FakeServiceWorker(worker_helper), worker_helper_(worker_helper) {}
     ~ServiceWorker() override = default;
 
+    void DispatchCanMakePaymentEvent(
+        payments::mojom::CanMakePaymentEventDataPtr event_data,
+        payments::mojom::PaymentHandlerResponseCallbackPtr response_callback,
+        DispatchCanMakePaymentEventCallback callback) override {
+      bool can_make_payment = false;
+      for (const auto& method_data : event_data->method_data) {
+        if (method_data->supported_method == "test-method") {
+          can_make_payment = true;
+          break;
+        }
+      }
+      response_callback->OnResponseForCanMakePayment(can_make_payment);
+      std::move(callback).Run(
+          blink::mojom::ServiceWorkerEventStatus::COMPLETED);
+    }
+
     void DispatchPaymentRequestEvent(
         payments::mojom::PaymentRequestEventDataPtr event_data,
         payments::mojom::PaymentHandlerResponseCallbackPtr response_callback,

content/browser/payments/payment_app_provider_impl_unittest.cc

@@ -158,10 +158,10 @@ TEST_F(PaymentAppProviderTest, CanMakePaymentTest) {
 
   payments::mojom::CanMakePaymentEventDataPtr event_data =
       payments::mojom::CanMakePaymentEventData::New();
-  payments::mojom::PaymentMethodDataPtr methodData =
+  payments::mojom::PaymentMethodDataPtr method_data =
       payments::mojom::PaymentMethodData::New();
-  methodData->supported_method = "test-method";
-  event_data->method_data.push_back(std::move(methodData));
+  method_data->supported_method = "test-method";
+  event_data->method_data.push_back(std::move(method_data));
 
   bool can_make_payment = false;
   base::RunLoop loop;

content/browser/service_worker/embedded_worker_test_helper.cc

@@ -386,37 +386,6 @@ void EmbeddedWorkerTestHelper::OnFetchEvent(
   OnFetchEventCommon(std::move(response_callback), std::move(finish_callback));
 }
 
-void EmbeddedWorkerTestHelper::OnAbortPaymentEvent(
-    payments::mojom::PaymentHandlerResponseCallbackPtr response_callback,
-    blink::mojom::ServiceWorker::DispatchAbortPaymentEventCallback callback) {
-  response_callback->OnResponseForAbortPayment(true);
-  std::move(callback).Run(blink::mojom::ServiceWorkerEventStatus::COMPLETED);
-}
-
-void EmbeddedWorkerTestHelper::OnCanMakePaymentEvent(
-    payments::mojom::CanMakePaymentEventDataPtr event_data,
-    payments::mojom::PaymentHandlerResponseCallbackPtr response_callback,
-    blink::mojom::ServiceWorker::DispatchCanMakePaymentEventCallback callback) {
-  bool can_make_payment = false;
-  for (const auto& method_data : event_data->method_data) {
-    if (method_data->supported_method == "test-method") {
-      can_make_payment = true;
-      break;
-    }
-  }
-  response_callback->OnResponseForCanMakePayment(can_make_payment);
-  std::move(callback).Run(blink::mojom::ServiceWorkerEventStatus::COMPLETED);
-}
-
-void EmbeddedWorkerTestHelper::OnPaymentRequestEvent(
-    payments::mojom::PaymentRequestEventDataPtr event_data,
-    payments::mojom::PaymentHandlerResponseCallbackPtr response_callback,
-    blink::mojom::ServiceWorker::DispatchPaymentRequestEventCallback callback) {
-  response_callback->OnResponseForPaymentRequest(
-      payments::mojom::PaymentHandlerResponse::New());
-  std::move(callback).Run(blink::mojom::ServiceWorkerEventStatus::COMPLETED);
-}
-
 void EmbeddedWorkerTestHelper::OnSetIdleTimerDelayToZero(
     int embedded_worker_id) {
   // Subclasses may implement this method.
@@ -490,37 +459,6 @@ void EmbeddedWorkerTestHelper::OnFetchEventStub(
                      std::move(finish_callback)));
 }
 
-void EmbeddedWorkerTestHelper::OnAbortPaymentEventStub(
-    payments::mojom::PaymentHandlerResponseCallbackPtr response_callback,
-    blink::mojom::ServiceWorker::DispatchAbortPaymentEventCallback callback) {
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE, base::BindOnce(&EmbeddedWorkerTestHelper::OnAbortPaymentEvent,
-                                AsWeakPtr(), std::move(response_callback),
-                                std::move(callback)));
-}
-
-void EmbeddedWorkerTestHelper::OnCanMakePaymentEventStub(
-    payments::mojom::CanMakePaymentEventDataPtr event_data,
-    payments::mojom::PaymentHandlerResponseCallbackPtr response_callback,
-    blink::mojom::ServiceWorker::DispatchCanMakePaymentEventCallback callback) {
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE,
-      base::BindOnce(&EmbeddedWorkerTestHelper::OnCanMakePaymentEvent,
-                     AsWeakPtr(), std::move(event_data),
-                     std::move(response_callback), std::move(callback)));
-}
-
-void EmbeddedWorkerTestHelper::OnPaymentRequestEventStub(
-    payments::mojom::PaymentRequestEventDataPtr event_data,
-    payments::mojom::PaymentHandlerResponseCallbackPtr response_callback,
-    blink::mojom::ServiceWorker::DispatchPaymentRequestEventCallback callback) {
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE,
-      base::BindOnce(&EmbeddedWorkerTestHelper::OnPaymentRequestEvent,
-                     AsWeakPtr(), std::move(event_data),
-                     std::move(response_callback), std::move(callback)));
-}
-
 EmbeddedWorkerRegistry* EmbeddedWorkerTestHelper::registry() {
   DCHECK(context());
   return context()->embedded_worker_registry();

content/browser/service_worker/embedded_worker_test_helper.h

@@ -188,19 +188,6 @@ class EmbeddedWorkerTestHelper {
       blink::mojom::FetchEventPreloadHandlePtr preload_handle,
       blink::mojom::ServiceWorkerFetchResponseCallbackPtr response_callback,
       blink::mojom::ServiceWorker::DispatchFetchEventCallback finish_callback);
-  virtual void OnAbortPaymentEvent(
-      payments::mojom::PaymentHandlerResponseCallbackPtr response_callback,
-      blink::mojom::ServiceWorker::DispatchAbortPaymentEventCallback callback);
-  virtual void OnCanMakePaymentEvent(
-      payments::mojom::CanMakePaymentEventDataPtr data,
-      payments::mojom::PaymentHandlerResponseCallbackPtr response_callback,
-      blink::mojom::ServiceWorker::DispatchCanMakePaymentEventCallback
-          callback);
-  virtual void OnPaymentRequestEvent(
-      payments::mojom::PaymentRequestEventDataPtr data,
-      payments::mojom::PaymentHandlerResponseCallbackPtr response_callback,
-      blink::mojom::ServiceWorker::DispatchPaymentRequestEventCallback
-          callback);
   virtual void OnSetIdleTimerDelayToZero(int embedded_worker_id);
 
   EmbeddedWorkerRegistry* registry();
@@ -253,19 +240,6 @@ class EmbeddedWorkerTestHelper {
       blink::mojom::FetchEventPreloadHandlePtr preload_handle,
       blink::mojom::ServiceWorkerFetchResponseCallbackPtr response_callback,
       blink::mojom::ServiceWorker::DispatchFetchEventCallback finish_callback);
-  void OnAbortPaymentEventStub(
-      payments::mojom::PaymentHandlerResponseCallbackPtr response_callback,
-      blink::mojom::ServiceWorker::DispatchAbortPaymentEventCallback callback);
-  void OnCanMakePaymentEventStub(
-      payments::mojom::CanMakePaymentEventDataPtr data,
-      payments::mojom::PaymentHandlerResponseCallbackPtr response_callback,
-      blink::mojom::ServiceWorker::DispatchCanMakePaymentEventCallback
-          callback);
-  void OnPaymentRequestEventStub(
-      payments::mojom::PaymentRequestEventDataPtr data,
-      payments::mojom::PaymentHandlerResponseCallbackPtr response_callback,
-      blink::mojom::ServiceWorker::DispatchPaymentRequestEventCallback
-          callback);
 
   std::unique_ptr<TestBrowserContext> browser_context_;
   std::unique_ptr<MockRenderProcessHost> render_process_host_;

content/browser/service_worker/fake_service_worker.cc

@@ -146,24 +146,25 @@ void FakeServiceWorker::DispatchSyncEvent(const std::string& tag,
 void FakeServiceWorker::DispatchAbortPaymentEvent(
     payments::mojom::PaymentHandlerResponseCallbackPtr response_callback,
     DispatchAbortPaymentEventCallback callback) {
-  helper_->OnAbortPaymentEventStub(std::move(response_callback),
-                                   std::move(callback));
+  response_callback->OnResponseForAbortPayment(true);
+  std::move(callback).Run(blink::mojom::ServiceWorkerEventStatus::COMPLETED);
 }
 
 void FakeServiceWorker::DispatchCanMakePaymentEvent(
     payments::mojom::CanMakePaymentEventDataPtr event_data,
     payments::mojom::PaymentHandlerResponseCallbackPtr response_callback,
     DispatchCanMakePaymentEventCallback callback) {
-  helper_->OnCanMakePaymentEventStub(
-      std::move(event_data), std::move(response_callback), std::move(callback));
+  response_callback->OnResponseForCanMakePayment(true);
+  std::move(callback).Run(blink::mojom::ServiceWorkerEventStatus::COMPLETED);
 }
 
 void FakeServiceWorker::DispatchPaymentRequestEvent(
     payments::mojom::PaymentRequestEventDataPtr event_data,
     payments::mojom::PaymentHandlerResponseCallbackPtr response_callback,
     DispatchPaymentRequestEventCallback callback) {
-  helper_->OnPaymentRequestEventStub(
-      std::move(event_data), std::move(response_callback), std::move(callback));
+  response_callback->OnResponseForPaymentRequest(
+      payments::mojom::PaymentHandlerResponse::New());
+  std::move(callback).Run(blink::mojom::ServiceWorkerEventStatus::COMPLETED);
 }
 
 void FakeServiceWorker::DispatchExtendableMessageEvent(