PaymentApp: Implement respondWith() in PaymentRequestEvent. (content side)

content/browser/payments/payment_app_content_unittest_base.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/payments/payment_app_content_unittest_base.h"
 
 #include <stdint.h>
 
 #include <set>
 #include <utility>
@@ skipping 29 matching lines @@
   *called = true;
 }
 
 }  // namespace
 
 class PaymentAppContentUnitTestBase::PaymentAppForWorkerTestHelper
     : public EmbeddedWorkerTestHelper {
  public:
   PaymentAppForWorkerTestHelper()
       : EmbeddedWorkerTestHelper(base::FilePath()),
-        was_dispatched_(false),
         last_sw_registration_id_(kInvalidServiceWorkerRegistrationId) {}
   ~PaymentAppForWorkerTestHelper() override {}
 
   void OnStartWorker(
       int embedded_worker_id,
       int64_t service_worker_version_id,
       const GURL& scope,
       const GURL& script_url,
       bool pause_after_download,
       mojom::ServiceWorkerEventDispatcherRequest request) override {
     ServiceWorkerVersion* version =
         context()->GetLiveVersion(service_worker_version_id);
     last_sw_registration_id_ = version->registration_id();
     last_sw_scope_ = scope;
     EmbeddedWorkerTestHelper::OnStartWorker(
         embedded_worker_id, service_worker_version_id, scope, script_url,
         pause_after_download, std::move(request));
   }
 
   void OnPaymentRequestEvent(
       payments::mojom::PaymentAppRequestPtr app_request,
+      payments::mojom::PaymentAppResponseCallbackPtr response_callback,
       const mojom::ServiceWorkerEventDispatcher::
           DispatchPaymentRequestEventCallback& callback) override {
-    ASSERT_FALSE(was_dispatched_);
-    EmbeddedWorkerTestHelper::OnPaymentRequestEvent(std::move(app_request),
-                                                    callback);
-    was_dispatched_ = true;
+    EmbeddedWorkerTestHelper::OnPaymentRequestEvent(
+        std::move(app_request), std::move(response_callback), callback);
   }
 
-  bool was_dispatched_;
   int64_t last_sw_registration_id_;
   GURL last_sw_scope_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PaymentAppForWorkerTestHelper);
 };
 
 PaymentAppContentUnitTestBase::PaymentAppContentUnitTestBase()
     : thread_bundle_(
           new TestBrowserThreadBundle(TestBrowserThreadBundle::IO_MAINLOOP)),
@@ skipping 98 matching lines @@
 void PaymentAppContentUnitTestBase::UnregisterServiceWorker(
     const GURL& scope_url) {
   // Unregister service worker.
   bool called = false;
   worker_helper_->context()->UnregisterServiceWorker(
       scope_url, base::Bind(&UnregisterServiceWorkerCallback, &called));
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(called);
 }
 
-void PaymentAppContentUnitTestBase::ResetPaymentAppInvoked() const {
-  worker_helper_->was_dispatched_ = false;
-}
-
-bool PaymentAppContentUnitTestBase::payment_app_invoked() const {
-  return worker_helper_->was_dispatched_;
-}
-
 int64_t PaymentAppContentUnitTestBase::last_sw_registration_id() const {
   return worker_helper_->last_sw_registration_id_;
 }
 
 const GURL& PaymentAppContentUnitTestBase::last_sw_scope_url() const {
   return worker_helper_->last_sw_scope_;
 }
 
 StoragePartitionImpl* PaymentAppContentUnitTestBase::storage_partition() {
   return static_cast<StoragePartitionImpl*>(
       BrowserContext::GetDefaultStoragePartition(browser_context()));
 }
 
 PaymentAppContextImpl* PaymentAppContentUnitTestBase::payment_app_context() {
   return storage_partition()->GetPaymentAppContext();
 }
 
 }  // namespace content