Make payment manifest download/parse cross-platform

chrome/utility/chrome_content_utility_client.cc

 // Copyright (c) 2012 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 "chrome/utility/chrome_content_utility_client.h"
 
 #include <stddef.h>
 #include <utility>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "chrome/common/file_patcher.mojom.h"
 #include "chrome/utility/utility_message_handler.h"
+#include "components/payments/content/utility/payment_manifest_parser.h"
 #include "components/safe_json/utility/safe_json_parser_mojo_impl.h"
 #include "content/public/child/image_decoder_utils.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/service_info.h"
 #include "content/public/utility/utility_thread.h"
 #include "courgette/courgette.h"
 #include "courgette/third_party/bsdiff/bsdiff.h"
 #include "extensions/features/features.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "printing/features/features.h"
 #include "services/image_decoder/image_decoder_service.h"
 #include "services/image_decoder/public/interfaces/constants.mojom.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
 #include "third_party/zlib/google/zip.h"
 
 #if !defined(OS_ANDROID)
 #include "chrome/common/resource_usage_reporter.mojom.h"
 #include "chrome/utility/profile_import_handler.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "net/proxy/mojo_proxy_resolver_factory_impl.h"
 #include "net/proxy/proxy_resolver_v8.h"
-#else
-#include "components/payments/content/android/utility/payment_manifest_parser.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/common/zip_file_creator.mojom.h"
 #endif
 
 #if defined(OS_WIN)
 #include "chrome/utility/ipc_shell_handler_win.h"
 #include "chrome/utility/shell_handler_impl_win.h"
 #endif
@@ skipping 230 matching lines @@
   if (utility_process_running_elevated_)
     return;
 
   registry->AddInterface(base::Bind(&FilePatcherImpl::Create));
 #if !defined(OS_ANDROID)
   registry->AddInterface<net::interfaces::ProxyResolverFactory>(
       base::Bind(CreateProxyResolverFactory));
   registry->AddInterface(base::Bind(CreateResourceUsageReporter));
   registry->AddInterface(base::Bind(&ProfileImportHandler::Create));
 #else
   registry->AddInterface(base::Bind(&payments::PaymentManifestParser::Create));

[Mathieu, 2017/03/21 20:18:12]

are we not binding it yet on other platforms? Is there a crbug to implement this
soon?

[please use gerrit instead, 2017/03/21 20:34:51]

Oops, my mistake. I need to register this on all platforms in order to make
manifest parsing cross-platform.

 #endif
   registry->AddInterface(
       base::Bind(&safe_json::SafeJsonParserMojoImpl::Create));
 #if defined(OS_WIN)
   registry->AddInterface(base::Bind(&ShellHandlerImpl::Create));
 #endif
 #if defined(OS_CHROMEOS)
   registry->AddInterface(base::Bind(&ZipFileCreatorImpl::Create));
 #endif
 #if defined(FULL_SAFE_BROWSING)
   registry->AddInterface(base::Bind(&SafeArchiveAnalyzerImpl::Create));
 #endif
 }
 
 void ChromeContentUtilityClient::RegisterServices(StaticServiceMap* services) {
   content::ServiceInfo image_decoder_info;
   image_decoder_info.factory = base::Bind(&CreateImageDecoderService);
   services->insert(
       std::make_pair(image_decoder::mojom::kServiceName, image_decoder_info));
 }
 
 // static
 void ChromeContentUtilityClient::PreSandboxStartup() {
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   extensions::ExtensionsHandler::PreSandboxStartup();
 #endif
 }