PaymentHandler: Stop using GetAllManifests() in content side tests.

content/browser/payments/payment_app_browsertest.cc

 // Copyright 2017 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 "base/command_line.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "components/payments/mojom/payment_app.mojom.h"
 #include "content/public/browser/payment_app_provider.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 namespace {
 
-void GetAllManifestsCallback(const base::Closure& done_callback,
-                             PaymentAppProvider::Manifests* out_manifests,
-                             PaymentAppProvider::Manifests manifests) {
-  *out_manifests = std::move(manifests);
+void GetAllPaymentAppsCallback(const base::Closure& done_callback,
+                               PaymentAppProvider::PaymentApps* out_apps,
+                               PaymentAppProvider::PaymentApps apps) {
+  *out_apps = std::move(apps);
   done_callback.Run();
 }
 
 void InvokePaymentAppCallback(
     const base::Closure& done_callback,
     payments::mojom::PaymentAppResponsePtr* out_response,
     payments::mojom::PaymentAppResponsePtr response) {
   *out_response = std::move(response);
   done_callback.Run();
 }
@@ skipping 33 matching lines @@
   }
 
   void RegisterPaymentApp() {
     std::string script_result;
     ASSERT_TRUE(RunScript("registerPaymentApp()", &script_result));
     ASSERT_EQ("registered", script_result);
   }
 
   std::vector<int64_t> GetAllPaymentAppIDs() {
     base::RunLoop run_loop;
-    PaymentAppProvider::Manifests manifests;
-    PaymentAppProvider::GetInstance()->GetAllManifests(
+    PaymentAppProvider::PaymentApps apps;
+    PaymentAppProvider::GetInstance()->GetAllPaymentApps(
         shell()->web_contents()->GetBrowserContext(),
-        base::Bind(&GetAllManifestsCallback, run_loop.QuitClosure(),
-                   &manifests));
+        base::BindOnce(&GetAllPaymentAppsCallback, run_loop.QuitClosure(),
+                       &apps));
     run_loop.Run();
 
     std::vector<int64_t> ids;
-    for (const auto& manifest : manifests) {
-      ids.push_back(manifest.first);
+    for (const auto& app_info : apps) {
+      for (const auto& instrument : app_info.second) {
+        ids.push_back(instrument->registration_id);
+      }
     }
 
     return ids;
   }
 
   payments::mojom::PaymentAppResponsePtr InvokePaymentApp(
       int64_t registration_id) {
     payments::mojom::PaymentAppRequestPtr app_request =
         payments::mojom::PaymentAppRequest::New();
     app_request->method_data.push_back(
@@ skipping 23 matching lines @@
   RegisterPaymentApp();
 
   std::vector<int64_t> ids = GetAllPaymentAppIDs();
   ASSERT_EQ(1U, ids.size());
 
   payments::mojom::PaymentAppResponsePtr response(InvokePaymentApp(ids[0]));
   ASSERT_EQ("test", response->method_name);
 }
 
 }  // namespace content