PaymentApp: Add a interface to query all payment app manifests.

content/browser/payments/payment_app_context_impl.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_CONTEXT_H_
-#define CONTENT_BROWSER_PAYMENTS_PAYMENT_APP_CONTEXT_H_
+#ifndef CONTENT_BROWSER_PAYMENTS_PAYMENT_APP_CONTEXT_IMPL_H_
+#define CONTENT_BROWSER_PAYMENTS_PAYMENT_APP_CONTEXT_IMPL_H_
 
 #include <map>
 #include <memory>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "components/payments/payment_app.mojom.h"
 #include "content/common/content_export.h"
+#include "content/public/browser/payment_app_context.h"
 
 namespace content {
 
 class PaymentAppManager;
 class ServiceWorkerContextWrapper;
 
-class CONTENT_EXPORT PaymentAppContext
-    : public base::RefCountedThreadSafe<PaymentAppContext> {
+class CONTENT_EXPORT PaymentAppContextImpl
+    : NON_EXPORTED_BASE(public PaymentAppContext),
+      public base::RefCountedThreadSafe<PaymentAppContextImpl> {

[please use gerrit instead, 2016/12/14 16:50:05]

The pure interface PaymentAppContext should be listed after the
RefCountedThreadSafe, which has an implementation.

"Multiple inheritance is allowed only when all superclasses, with the possible
exception of the first one, are pure interfaces."

https://google.github.io/styleguide/cppguide.html#Multiple_Inheritance

[zino, 2016/12/14 17:20:19]

Done.

  public:
-  explicit PaymentAppContext(
+  explicit PaymentAppContextImpl(
       scoped_refptr<ServiceWorkerContextWrapper> service_worker_context);
 
   // Shutdown must be called before deleting this. Call on the UI thread.
   void Shutdown();
 
   // Create a PaymentAppManager that is owned by this. Call on the UI
   // thread.
   void CreateService(
       mojo::InterfaceRequest<payments::mojom::PaymentAppManager> request);
 
   // Called by PaymentAppManager objects so that they can
   // be deleted. Call on the IO thread.
   void ServiceHadConnectionError(PaymentAppManager* service);
 
   ServiceWorkerContextWrapper* service_worker_context() const;
 

[please use gerrit instead, 2016/12/14 16:50:05]

// PaymentAppContext implementation:

[zino, 2016/12/14 17:20:19]

Done.

+  void GetAllManifests(const GetAllManifestsCallback& callback) override;
+
  protected:
-  friend class base::RefCountedThreadSafe<PaymentAppContext>;
+  friend class base::RefCountedThreadSafe<PaymentAppContextImpl>;
   friend class PaymentAppManagerTest;
-  virtual ~PaymentAppContext();
+  virtual ~PaymentAppContextImpl();

[please use gerrit instead, 2016/12/14 16:50:05]

override instead of virtual

Can you make it private?

[zino, 2016/12/14 17:20:19]

Done.

 
  private:
   void CreateServiceOnIOThread(
       mojo::InterfaceRequest<payments::mojom::PaymentAppManager> request);
 
   void ShutdownOnIO();
 
   scoped_refptr<ServiceWorkerContextWrapper> service_worker_context_;
 
   // The services are owned by this. They're either deleted
   // during ShutdownOnIO or when the channel is closed via
   // ServiceHadConnectionError. Only accessed on the IO thread.
   std::map<PaymentAppManager*, std::unique_ptr<PaymentAppManager>> services_;
 
-  DISALLOW_COPY_AND_ASSIGN(PaymentAppContext);
+  DISALLOW_COPY_AND_ASSIGN(PaymentAppContextImpl);
 };
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_PAYMENTS_PAYMENT_APP_CONTEXT_H_
+#endif  // CONTENT_BROWSER_PAYMENTS_PAYMENT_APP_CONTEXT_IMPL_H_