Relanding "Changing payment manifest parsing to use the SafeJsonParser"

The initial CL broke the mojo linux bot which is a FYI bot and will be
fixed independently.

This reverts commit aa0190573142a5380c2e780c65a0fad2f3d5f129.

Bug: 775679
Tbr: [email protected], [email protected], [email protected]
Change-Id: Iefc5ebba6043d181c8b1410215c84af341f35871
Reviewed-on: https://chromium-review.googlesource.com/735119
Reviewed-by: Jay Civelli <[email protected]>
Commit-Queue: Jay Civelli <[email protected]>
Cr-Commit-Position: refs/heads/master@{#511215}
diff --git a/chrome/browser/payments/manifest_verifier_browsertest.cc b/chrome/browser/payments/manifest_verifier_browsertest.cc
index 7dd2b0c..0ef72cc5 100644
--- a/chrome/browser/payments/manifest_verifier_browsertest.cc
+++ b/chrome/browser/payments/manifest_verifier_browsertest.cc
@@ -13,8 +13,8 @@
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/web_data_service_factory.h"
 #include "chrome/test/base/in_process_browser_test.h"
-#include "components/payments/content/payment_manifest_parser_host.h"
 #include "components/payments/content/payment_manifest_web_data_service.h"
+#include "components/payments/content/utility/payment_manifest_parser.h"
 #include "components/payments/core/payment_manifest_downloader.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/storage_partition.h"
@@ -88,7 +88,7 @@
 
     ManifestVerifier verifier(
         std::move(downloader),
-        std::make_unique<payments::PaymentManifestParserHost>(),
+        std::make_unique<payments::PaymentManifestParser>(),
         WebDataServiceFactory::GetPaymentManifestWebDataForProfile(
             ProfileManager::GetActiveUserProfile(),
             ServiceAccessType::EXPLICIT_ACCESS));