[Payment Request] Change the lifetime management of PaymentRequestImpl

components/payments/payment_request_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 CHROME_BROWSER_PAYMENTS_PAYMENT_REQUEST_IMPL_H_
-#define CHROME_BROWSER_PAYMENTS_PAYMENT_REQUEST_IMPL_H_
+#ifndef COMPONENTS_PAYMENTS_PAYMENT_REQUEST_IMPL_H_
+#define COMPONENTS_PAYMENTS_PAYMENT_REQUEST_IMPL_H_
+
+#include <memory>
 
 #include "components/payments/payment_request.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 namespace content {
 class WebContents;
 }
 
 namespace payments {
 
-class PaymentRequestImpl : payments::mojom::PaymentRequest,
-                           public base::RefCounted<PaymentRequestImpl> {
+class PaymentRequestDelegate;
+class PaymentRequestWebContentsManager;
+
+class PaymentRequestImpl : payments::mojom::PaymentRequest {

[sky, 2017/01/09 18:55:32]

One of the reasons we standardized on putting all mojoms in the mojom namespace
is so that you don't have to name classes like this with Impl. Use
PaymentRequest.

[Mathieu, 2017/01/09 19:17:42]

Thanks, I've changed this.

  public:
   PaymentRequestImpl(
       content::WebContents* web_contents,
+      std::unique_ptr<PaymentRequestDelegate> delegate,
+      PaymentRequestWebContentsManager* manager,
       mojo::InterfaceRequest<payments::mojom::PaymentRequest> request);
+  ~PaymentRequestImpl() override;
 
   // payments::mojom::PaymentRequest "stub"
   void Init(payments::mojom::PaymentRequestClientPtr client,
             std::vector<payments::mojom::PaymentMethodDataPtr> methodData,
             payments::mojom::PaymentDetailsPtr details,
             payments::mojom::PaymentOptionsPtr options) override;
   void Show() override;
   void UpdateWith(payments::mojom::PaymentDetailsPtr details) override {}
   void Abort() override {}
   void Complete(payments::mojom::PaymentComplete result) override {}
   void CanMakePayment() override {}
 
   void Cancel();
   void OnError();
   payments::mojom::PaymentDetails* details() { return details_.get(); }
 
   content::WebContents* web_contents() { return web_contents_; }
 
  private:
-  friend class base::RefCounted<PaymentRequestImpl>;
-  ~PaymentRequestImpl() override;
-
   content::WebContents* web_contents_;
+  std::unique_ptr<PaymentRequestDelegate> delegate_;
+  // |manager_| owns this PaymentRequestImpl.
+  PaymentRequestWebContentsManager* manager_;
   mojo::Binding<payments::mojom::PaymentRequest> binding_;
   payments::mojom::PaymentRequestClientPtr client_;
   payments::mojom::PaymentDetailsPtr details_;
 
   DISALLOW_COPY_AND_ASSIGN(PaymentRequestImpl);
 };
 
 }  // namespace payments
 
-void CreatePaymentRequestHandler(
-    content::WebContents* web_contents,
-    mojo::InterfaceRequest<payments::mojom::PaymentRequest> request);
-
-#endif  // CHROME_BROWSER_PAYMENTS_PAYMENT_REQUEST_IMPL_H_
+#endif  // COMPONENTS_PAYMENTS_PAYMENT_REQUEST_IMPL_H_