PaymentApp: Remove scope_url parameter from Get/SetManifest methods.

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 15 matching lines @@
 namespace {
 
 void RegisterServiceWorkerCallback(bool* called,
                                    ServiceWorkerStatusCode status,
                                    const std::string& status_message,
                                    int64_t registration_id) {
   EXPECT_EQ(SERVICE_WORKER_OK, status) << ServiceWorkerStatusToString(status);
   *called = true;
 }
 
+void UnregisterServiceWorkerCallback(bool* called,
+                                     ServiceWorkerStatusCode status) {
+  EXPECT_EQ(SERVICE_WORKER_OK, status) << ServiceWorkerStatusToString(status);
+  *called = true;
+}
+
 }  // namespace
 
 PaymentAppContentUnitTestBase::PaymentAppContentUnitTestBase()
     : thread_bundle_(
           new TestBrowserThreadBundle(TestBrowserThreadBundle::IO_MAINLOOP)),
       embedded_worker_helper_(new EmbeddedWorkerTestHelper(base::FilePath())),
       storage_partition_impl_(
           new StoragePartitionImpl(embedded_worker_helper_->browser_context(),
                                    base::FilePath(),
                                    nullptr)),
@@ skipping 35 matching lines @@
   payments::mojom::PaymentAppManagerPtr manager;
   mojo::InterfaceRequest<payments::mojom::PaymentAppManager> request =
       mojo::GetProxy(&manager);
   payment_app_managers_.push_back(std::move(manager));
   payment_app_context_->CreatePaymentAppManager(std::move(request));
   base::RunLoop().RunUntilIdle();
 
   // Find a last registered payment app manager.
   for (const auto& candidate_manager :
        payment_app_context_->payment_app_managers_) {
-    if (!base::ContainsKey(existing_managers, candidate_manager.first))
+    if (!base::ContainsKey(existing_managers, candidate_manager.first)) {
+      candidate_manager.first->Init(scope_url.spec());

[please use gerrit instead, 2016/12/20 16:57:54]

Run the loop here as well, because Init() posts a task to IO thread.

[zino, 2016/12/20 17:18:37]

Done.

       return candidate_manager.first;
+    }
   }
 
   NOTREACHED();
   return nullptr;
 }
 
 void PaymentAppContentUnitTestBase::SetManifest(
     PaymentAppManager* manager,
-    const std::string& scope,
     payments::mojom::PaymentAppManifestPtr manifest,
     const PaymentAppManager::SetManifestCallback& callback) {
   ASSERT_NE(nullptr, manager);
-  manager->SetManifest(scope, std::move(manifest), callback);
+  manager->SetManifest(std::move(manifest), callback);
   base::RunLoop().RunUntilIdle();
 }
 
 void PaymentAppContentUnitTestBase::GetManifest(
     PaymentAppManager* manager,
-    const std::string& scope,
     const PaymentAppManager::GetManifestCallback& callback) {
   ASSERT_NE(nullptr, manager);
-  manager->GetManifest(scope, callback);
+  manager->GetManifest(callback);
   base::RunLoop().RunUntilIdle();
 }
 
+void PaymentAppContentUnitTestBase::UnregisterServiceWorker(
+    const GURL& scope_url) {
+  // Unregister service worker.
+  bool called = false;
+  embedded_worker_helper_->context()->UnregisterServiceWorker(
+      scope_url, base::Bind(&UnregisterServiceWorkerCallback, &called));
+  base::RunLoop().RunUntilIdle();
+  EXPECT_TRUE(called);
+}
+
 }  // namespace content