PaymentHandler: Remove PaymentAppManifest and PaymentAppOption.

content/browser/payments/payment_app_database.cc

Index: content/browser/payments/payment_app_database.cc
diff --git a/content/browser/payments/payment_app_database.cc b/content/browser/payments/payment_app_database.cc
index e822e2d65b91b42a83a9428a450551b63be99ff4..6c21abc1491e9d6c09b993fc9145bd43c9a413c7 100644
--- a/content/browser/payments/payment_app_database.cc
+++ b/content/browser/payments/payment_app_database.cc
@@ -24,7 +24,6 @@ using ::payments::mojom::PaymentHandlerStatus;
 using ::payments::mojom::PaymentInstrument;
 using ::payments::mojom::PaymentInstrumentPtr;
 
-const char kPaymentAppManifestDataKey[] = "PaymentAppManifestData";
 const char kPaymentInstrumentPrefix[] = "PaymentInstrument:";
 const char kPaymentInstrumentKeyInfoPrefix[] = "PaymentInstrumentKeyInfo:";
 
@@ -37,32 +36,6 @@ std::string CreatePaymentInstrumentKeyInfoKey(
   return kPaymentInstrumentKeyInfoPrefix + instrument_key;
 }
 
-payments::mojom::PaymentAppManifestPtr DeserializePaymentAppManifest(
-    const std::string& input) {
-  PaymentAppManifestProto manifest_proto;
-  if (!manifest_proto.ParseFromString(input))
-    return nullptr;
-
-  payments::mojom::PaymentAppManifestPtr manifest =
-      payments::mojom::PaymentAppManifest::New();
-  manifest->name = manifest_proto.name();
-  if (manifest_proto.has_icon())
-    manifest->icon = manifest_proto.icon();
-  for (const auto& option_proto : manifest_proto.options()) {
-    payments::mojom::PaymentAppOptionPtr option =
-        payments::mojom::PaymentAppOption::New();
-    option->name = option_proto.name();
-    if (option_proto.has_icon())
-      option->icon = option_proto.icon();
-    option->id = option_proto.id();
-    for (const auto& method : option_proto.enabled_methods())
-      option->enabled_methods.push_back(method);
-    manifest->options.push_back(std::move(option));
-  }
-
-  return manifest;
-}
-
 std::map<uint64_t, std::string> ToStoredPaymentInstrumentKeyInfos(
     const std::vector<std::string>& inputs) {
   std::map<uint64_t, std::string> key_info;
@@ -123,37 +96,6 @@ PaymentAppDatabase::~PaymentAppDatabase() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 }
 
-void PaymentAppDatabase::WriteManifest(
-    const GURL& scope,
-    payments::mojom::PaymentAppManifestPtr manifest,
-    WriteManifestCallback callback) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-
-  service_worker_context_->FindReadyRegistrationForPattern(
-      scope, base::Bind(&PaymentAppDatabase::DidFindRegistrationToWriteManifest,
-                        weak_ptr_factory_.GetWeakPtr(), base::Passed(&manifest),
-                        base::Passed(&callback)));
-}
-
-void PaymentAppDatabase::ReadManifest(const GURL& scope,
-                                      ReadManifestCallback callback) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-
-  service_worker_context_->FindReadyRegistrationForPattern(
-      scope,
-      base::Bind(&PaymentAppDatabase::DidFindRegistrationToReadManifest,
-                 weak_ptr_factory_.GetWeakPtr(), base::Passed(&callback)));
-}
-
-void PaymentAppDatabase::ReadAllManifests(ReadAllManifestsCallback callback) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-
-  service_worker_context_->GetUserDataForAllRegistrations(
-      kPaymentAppManifestDataKey,
-      base::Bind(&PaymentAppDatabase::DidReadAllManifests,
-                 weak_ptr_factory_.GetWeakPtr(), base::Passed(&callback)));
-}
-
 void PaymentAppDatabase::ReadAllPaymentApps(
     ReadAllPaymentAppsCallback callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ -246,120 +188,6 @@ void PaymentAppDatabase::ClearPaymentInstruments(
           base::Passed(std::move(callback))));
 }
 
-void PaymentAppDatabase::DidFindRegistrationToWriteManifest(
-    payments::mojom::PaymentAppManifestPtr manifest,
-    WriteManifestCallback callback,
-    ServiceWorkerStatusCode status,
-    scoped_refptr<ServiceWorkerRegistration> registration) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  if (status != SERVICE_WORKER_OK) {
-    std::move(callback).Run(
-        payments::mojom::PaymentAppManifestError::NO_ACTIVE_WORKER);
-    return;
-  }
-
-  PaymentAppManifestProto manifest_proto;
-  manifest_proto.set_name(manifest->name);
-  if (manifest->icon)
-    manifest_proto.set_icon(manifest->icon.value());
-
-  for (const auto& option : manifest->options) {
-    PaymentAppOptionProto* option_proto = manifest_proto.add_options();
-    option_proto->set_name(option->name);
-    if (option->icon)
-      option_proto->set_icon(option->icon.value());
-    option_proto->set_id(option->id);
-    for (const auto& method : option->enabled_methods) {
-      option_proto->add_enabled_methods(method);
-    }
-  }
-
-  std::string serialized;
-  bool success = manifest_proto.SerializeToString(&serialized);
-  DCHECK(success);
-
-  service_worker_context_->StoreRegistrationUserData(
-      registration->id(), registration->pattern().GetOrigin(),
-      {{kPaymentAppManifestDataKey, serialized}},
-      base::Bind(&PaymentAppDatabase::DidWriteManifest,
-                 weak_ptr_factory_.GetWeakPtr(), base::Passed(&callback)));
-}
-
-void PaymentAppDatabase::DidWriteManifest(WriteManifestCallback callback,
-                                          ServiceWorkerStatusCode status) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  std::move(callback).Run(status == SERVICE_WORKER_OK
-                              ? payments::mojom::PaymentAppManifestError::NONE
-                              : payments::mojom::PaymentAppManifestError::
-                                    MANIFEST_STORAGE_OPERATION_FAILED);
-}
-
-void PaymentAppDatabase::DidFindRegistrationToReadManifest(
-    ReadManifestCallback callback,
-    ServiceWorkerStatusCode status,
-    scoped_refptr<ServiceWorkerRegistration> registration) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  if (status != SERVICE_WORKER_OK) {
-    std::move(callback).Run(
-        payments::mojom::PaymentAppManifest::New(),
-        payments::mojom::PaymentAppManifestError::NO_ACTIVE_WORKER);
-    return;
-  }
-
-  service_worker_context_->GetRegistrationUserData(
-      registration->id(), {kPaymentAppManifestDataKey},
-      base::Bind(&PaymentAppDatabase::DidReadManifest,
-                 weak_ptr_factory_.GetWeakPtr(), base::Passed(&callback)));
-}
-
-void PaymentAppDatabase::DidReadManifest(ReadManifestCallback callback,
-                                         const std::vector<std::string>& data,
-                                         ServiceWorkerStatusCode status) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  if (status != SERVICE_WORKER_OK || data.size() != 1) {
-    std::move(callback).Run(payments::mojom::PaymentAppManifest::New(),
-                            payments::mojom::PaymentAppManifestError::
-                                MANIFEST_STORAGE_OPERATION_FAILED);
-    return;
-  }
-
-  payments::mojom::PaymentAppManifestPtr manifest =
-      DeserializePaymentAppManifest(data[0]);
-  if (!manifest) {
-    std::move(callback).Run(payments::mojom::PaymentAppManifest::New(),
-                            payments::mojom::PaymentAppManifestError::
-                                MANIFEST_STORAGE_OPERATION_FAILED);
-    return;
-  }
-
-  std::move(callback).Run(std::move(manifest),
-                          payments::mojom::PaymentAppManifestError::NONE);
-}
-
-void PaymentAppDatabase::DidReadAllManifests(
-    ReadAllManifestsCallback callback,
-    const std::vector<std::pair<int64_t, std::string>>& raw_data,
-    ServiceWorkerStatusCode status) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  if (status != SERVICE_WORKER_OK) {
-    std::move(callback).Run(Manifests());
-    return;
-  }
-
-  Manifests manifests;
-  for (const auto& item_of_raw_data : raw_data) {
-    payments::mojom::PaymentAppManifestPtr manifest =
-        DeserializePaymentAppManifest(item_of_raw_data.second);
-    if (!manifest)
-      continue;
-
-    manifests.push_back(
-        ManifestWithID(item_of_raw_data.first, std::move(manifest)));
-  }
-
-  std::move(callback).Run(std::move(manifests));
-}
-
 void PaymentAppDatabase::DidReadAllPaymentApps(
     ReadAllPaymentAppsCallback callback,
     const std::vector<std::pair<int64_t, std::string>>& raw_data,