PaymentApp: Remove scope_url parameter from Get/SetManifest methods.

content/browser/payments/payment_app_manager_unittest.cc

Index: content/browser/payments/payment_app_manager_unittest.cc
diff --git a/content/browser/payments/payment_app_manager_unittest.cc b/content/browser/payments/payment_app_manager_unittest.cc
index 8d7339b7b49c69248afd9a9c2103db0809db1115..167ec1eded7e6da3917889cea104bb29710640a4 100644
--- a/content/browser/payments/payment_app_manager_unittest.cc
+++ b/content/browser/payments/payment_app_manager_unittest.cc
@@ -15,8 +15,6 @@ namespace {
 
 const char kServiceWorkerPattern[] = "https://example.com/a";
 const char kServiceWorkerScript[] = "https://example.com/a/script.js";
-const char kUnregisteredServiceWorkerPattern[] =
-    "https://example.com/unregistered";
 
 void SetManifestCallback(bool* called,
                          payments::mojom::PaymentAppManifestError* out_error,
@@ -75,8 +73,7 @@ TEST_F(PaymentAppManagerTest, SetAndGetManifest) {
   bool called = false;
   payments::mojom::PaymentAppManifestError error = payments::mojom::
       PaymentAppManifestError::MANIFEST_STORAGE_OPERATION_FAILED;
-  SetManifest(payment_app_manager(), kServiceWorkerPattern,
-              CreatePaymentAppManifestForTest(),
+  SetManifest(payment_app_manager(), CreatePaymentAppManifestForTest(),
               base::Bind(&SetManifestCallback, &called, &error));
   ASSERT_TRUE(called);
 
@@ -86,9 +83,8 @@ TEST_F(PaymentAppManagerTest, SetAndGetManifest) {
   payments::mojom::PaymentAppManifestPtr read_manifest;
   payments::mojom::PaymentAppManifestError read_error = payments::mojom::
       PaymentAppManifestError::MANIFEST_STORAGE_OPERATION_FAILED;
-  GetManifest(
-      payment_app_manager(), kServiceWorkerPattern,
-      base::Bind(&GetManifestCallback, &called, &read_manifest, &read_error));
+  GetManifest(payment_app_manager(), base::Bind(&GetManifestCallback, &called,
+                                                &read_manifest, &read_error));
   ASSERT_TRUE(called);
 
   ASSERT_EQ(payments::mojom::PaymentAppManifestError::NONE, read_error);
@@ -106,8 +102,8 @@ TEST_F(PaymentAppManagerTest, SetManifestWithoutAssociatedServiceWorker) {
   bool called = false;
   payments::mojom::PaymentAppManifestError error =
       payments::mojom::PaymentAppManifestError::NONE;
-  SetManifest(payment_app_manager(), kUnregisteredServiceWorkerPattern,
-              CreatePaymentAppManifestForTest(),
+  UnregisterServiceWorker(GURL(kServiceWorkerPattern));
+  SetManifest(payment_app_manager(), CreatePaymentAppManifestForTest(),
               base::Bind(&SetManifestCallback, &called, &error));
   ASSERT_TRUE(called);
 
@@ -119,9 +115,9 @@ TEST_F(PaymentAppManagerTest, GetManifestWithoutAssociatedServiceWorker) {
   payments::mojom::PaymentAppManifestPtr read_manifest;
   payments::mojom::PaymentAppManifestError read_error =
       payments::mojom::PaymentAppManifestError::NONE;
-  GetManifest(
-      payment_app_manager(), kUnregisteredServiceWorkerPattern,
-      base::Bind(&GetManifestCallback, &called, &read_manifest, &read_error));
+  UnregisterServiceWorker(GURL(kServiceWorkerPattern));
+  GetManifest(payment_app_manager(), base::Bind(&GetManifestCallback, &called,
+                                                &read_manifest, &read_error));
   ASSERT_TRUE(called);
 
   EXPECT_EQ(payments::mojom::PaymentAppManifestError::NO_ACTIVE_WORKER,
@@ -133,9 +129,8 @@ TEST_F(PaymentAppManagerTest, GetManifestWithNoSavedManifest) {
   payments::mojom::PaymentAppManifestPtr read_manifest;
   payments::mojom::PaymentAppManifestError read_error =
       payments::mojom::PaymentAppManifestError::NONE;
-  GetManifest(
-      payment_app_manager(), kServiceWorkerPattern,
-      base::Bind(&GetManifestCallback, &called, &read_manifest, &read_error));
+  GetManifest(payment_app_manager(), base::Bind(&GetManifestCallback, &called,
+                                                &read_manifest, &read_error));
   ASSERT_TRUE(called);
 
   EXPECT_EQ(payments::mojom::PaymentAppManifestError::