PaymentHandler: Implement set/get methods in PaymentInstruments (content)

content/browser/payments/payment_app_database.h

 // 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.
 
 #ifndef CONTENT_BROWSER_PAYMENTS_PAYMENT_APP_DATABASE_H_
 #define CONTENT_BROWSER_PAYMENTS_PAYMENT_APP_DATABASE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "components/payments/content/payment_app.mojom.h"
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
 #include "content/browser/service_worker/service_worker_registration.h"
 #include "content/common/content_export.h"
 #include "content/common/service_worker/service_worker_status_code.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
+using payments::mojom::PaymentHandlerStatus;

[please use gerrit instead, 2017/04/12 19:11:31]

Please don't put such "using" statements in headers, because they pollute the
namespaces of everyone who includes this file.

[zino, 2017/04/15 05:18:09]

Done.

+using payments::mojom::PaymentInstrument;
+using payments::mojom::PaymentInstrumentPtr;
+
 namespace content {
 
 class ServiceWorkerRegistration;
 
 class CONTENT_EXPORT PaymentAppDatabase {
  public:
   using WriteManifestCallback =
       base::Callback<void(payments::mojom::PaymentAppManifestError)>;
   using ReadManifestCallback =
       base::Callback<void(payments::mojom::PaymentAppManifestPtr,
                           payments::mojom::PaymentAppManifestError)>;
   using ManifestWithID =
       std::pair<int64_t, payments::mojom::PaymentAppManifestPtr>;
   using Manifests = std::vector<ManifestWithID>;
   using ReadAllManifestsCallback = base::Callback<void(Manifests)>;
+  using ReadPaymentInstrumentCallback =
+      base::OnceCallback<void(PaymentInstrumentPtr, PaymentHandlerStatus)>;
+  using WritePaymentInstrumentCallback =
+      base::OnceCallback<void(PaymentHandlerStatus)>;

[please use gerrit instead, 2017/04/12 19:11:31]

These "using" statements are OK, by the way.

 
   explicit PaymentAppDatabase(
       scoped_refptr<ServiceWorkerContextWrapper> service_worker_context);
   ~PaymentAppDatabase();
 
   void WriteManifest(const GURL& scope,
                      payments::mojom::PaymentAppManifestPtr manifest,
                      const WriteManifestCallback& callback);
   void ReadManifest(const GURL& scope, const ReadManifestCallback& callback);
   void ReadAllManifests(const ReadAllManifestsCallback& callback);
+  void ReadPaymentInstrument(const GURL& scope,
+                             const std::string& instrumentKey,
+                             ReadPaymentInstrumentCallback callback);
+  void WritePaymentInstrument(const GURL& scope,
+                              const std::string& instrumentKey,
+                              PaymentInstrumentPtr instrument,
+                              WritePaymentInstrumentCallback callback);
 
  private:
   // WriteManifest callbacks
   void DidFindRegistrationToWriteManifest(
       payments::mojom::PaymentAppManifestPtr manifest,
       const WriteManifestCallback& callback,
       ServiceWorkerStatusCode status,
       scoped_refptr<ServiceWorkerRegistration> registration);
   void DidWriteManifest(const WriteManifestCallback& callback,
                         ServiceWorkerStatusCode status);
 
   // ReadManifest callbacks
   void DidFindRegistrationToReadManifest(
       const ReadManifestCallback& callback,
       ServiceWorkerStatusCode status,
       scoped_refptr<ServiceWorkerRegistration> registration);
   void DidReadManifest(const ReadManifestCallback& callback,
                        const std::vector<std::string>& data,
                        ServiceWorkerStatusCode status);
 
   // ReadAllManifests callbacks
   void DidReadAllManifests(
       const ReadAllManifestsCallback& callback,
       const std::vector<std::pair<int64_t, std::string>>& raw_data,
       ServiceWorkerStatusCode status);
 
+  // ReadPaymentInstrument callbacks
+  void DidFindRegistrationToReadPaymentInstrument(
+      const std::string& instrumentKey,
+      ReadPaymentInstrumentCallback callback,
+      ServiceWorkerStatusCode status,
+      scoped_refptr<ServiceWorkerRegistration> registration);
+  void DidReadPaymentInstrument(ReadPaymentInstrumentCallback callback,
+                                const std::vector<std::string>& data,
+                                ServiceWorkerStatusCode status);
+
+  // WritePaymentInstrument callbacks
+  void DidFindRegistrationToWritePaymentInstrument(
+      const std::string& instrumentKey,
+      PaymentInstrumentPtr instrument,
+      WritePaymentInstrumentCallback callback,
+      ServiceWorkerStatusCode status,
+      scoped_refptr<ServiceWorkerRegistration> registration);
+  void DidWritePaymentInstrument(WritePaymentInstrumentCallback callback,
+                                 ServiceWorkerStatusCode status);
+
   scoped_refptr<ServiceWorkerContextWrapper> service_worker_context_;
   base::WeakPtrFactory<PaymentAppDatabase> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PaymentAppDatabase);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_PAYMENTS_PAYMENT_APP_DATABASE_H_