Chromium Code Reviews| Index: content/browser/payments/payment_app_context_impl.h |
| diff --git a/content/browser/payments/payment_app_context_impl.h b/content/browser/payments/payment_app_context_impl.h |
| index 8785bbcc8bd9945f3cba74bb5bb05876e2cefde6..4b9ba420ffd143582c10178fdc355df978349db1 100644 |
| --- a/content/browser/payments/payment_app_context_impl.h |
| +++ b/content/browser/payments/payment_app_context_impl.h |
| @@ -13,7 +13,6 @@ |
| #include "components/payments/payment_app.mojom.h" |
| #include "content/browser/payments/payment_app_database.h" |
| #include "content/common/content_export.h" |
| -#include "content/public/browser/payment_app_context.h" |
| namespace content { |
| @@ -42,8 +41,7 @@ class ServiceWorkerContextWrapper; |
| // 4) Shutdown() |
| // 5) Destructor |
| class CONTENT_EXPORT PaymentAppContextImpl |
| - : public base::RefCountedThreadSafe<PaymentAppContextImpl>, |
| - NON_EXPORTED_BASE(public PaymentAppContext) { |
| + : public base::RefCountedThreadSafe<PaymentAppContextImpl> { |
| public: |
| PaymentAppContextImpl(); |
| @@ -66,14 +64,10 @@ class CONTENT_EXPORT PaymentAppContextImpl |
| // Should be accessed only on the IO thread. |
| PaymentAppDatabase* payment_app_database() const; |
| - // PaymentAppContext implementation: |
| - // Should be accessed only on the UI thread. |
| - void GetAllManifests(const GetAllManifestsCallback& callback) override; |
| - |
| private: |
| friend class PaymentAppContentUnitTestBase; |
| friend class base::RefCountedThreadSafe<PaymentAppContextImpl>; |
| - ~PaymentAppContextImpl() override; |
|
please use gerrit instead
2017/01/04 16:55:43
base::RefCountedThreadSafe has a destructor, so we
zino
2017/01/04 17:29:59
Done.
zino
2017/01/05 00:08:04
There was no virtual destructor in RefCountedThrea
|
| + ~PaymentAppContextImpl(); |
| void CreatePaymentAppDatabaseOnIO( |
| scoped_refptr<ServiceWorkerContextWrapper> service_worker_context); |
| @@ -84,10 +78,6 @@ class CONTENT_EXPORT PaymentAppContextImpl |
| void ShutdownOnIO(); |
| void DidShutdown(); |
| - void GetAllManifestsOnIO(const GetAllManifestsCallback& callback); |
| - void DidGetAllManifestsOnIO(const GetAllManifestsCallback& callback, |
| - PaymentAppDatabase::Manifests manifests); |
| - |
| // Only accessed on the IO thread. |
| std::unique_ptr<PaymentAppDatabase> payment_app_database_; |