[Payment Request] Change the lifetime management of PaymentRequestImpl

chrome/browser/ui/views/payments/payment_sheet_view_controller.cc

 // 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.
 
 #include "chrome/browser/ui/views/payments/payment_sheet_view_controller.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/payments/payment_request_impl.h"
 #include "chrome/browser/ui/views/payments/payment_request_dialog.h"
 #include "chrome/browser/ui/views/payments/payment_request_views_util.h"
 #include "chrome/grit/generated_resources.h"
+#include "components/payments/payment_request.h"
 #include "components/strings/grit/components_strings.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/range/range.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/views/border.h"
@@ skipping 81 matching lines @@
         color_utils::DeriveDefaultIconColor(name_label->enabled_color())));
     layout->AddView(chevron);
   }
 
   DISALLOW_COPY_AND_ASSIGN(PaymentSheetRow);
 };
 
 }  // namespace
 
 PaymentSheetViewController::PaymentSheetViewController(
-    PaymentRequestImpl* impl, PaymentRequestDialog* dialog)
-  : PaymentRequestSheetController(impl, dialog) {}
+    PaymentRequest* request,
+    PaymentRequestDialog* dialog)
+    : PaymentRequestSheetController(request, dialog) {}
 
 PaymentSheetViewController::~PaymentSheetViewController() {}
 
 std::unique_ptr<views::View> PaymentSheetViewController::CreateView() {
   std::unique_ptr<views::View> content_view = base::MakeUnique<views::View>();
 
   views::GridLayout* layout = new views::GridLayout(content_view.get());
   content_view->SetLayoutManager(layout);
   views::ColumnSet* columns = layout->AddColumnSet(0);
   columns->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER,
@@ skipping 20 matching lines @@
         PaymentSheetViewControllerTags::SHOW_ORDER_SUMMARY_BUTTON):
       dialog()->ShowOrderSummary();
       break;
     default:
       NOTREACHED();
   }
 }
 
 std::unique_ptr<views::View>
 PaymentSheetViewController::CreateOrderSummarySectionContent() {
-  base::string16 label_value =
-      l10n_util::GetStringFUTF16(
-          IDS_PAYMENT_REQUEST_ORDER_SUMMARY_SECTION_TOTAL_FORMAT,
-          base::ASCIIToUTF16(impl()->details()->total->label),
-          base::ASCIIToUTF16(impl()->details()->total->amount->currency),
-          base::ASCIIToUTF16(impl()->details()->total->amount->value));
+  base::string16 label_value = l10n_util::GetStringFUTF16(
+      IDS_PAYMENT_REQUEST_ORDER_SUMMARY_SECTION_TOTAL_FORMAT,
+      base::ASCIIToUTF16(request()->details()->total->label),
+      base::ASCIIToUTF16(request()->details()->total->amount->currency),
+      base::ASCIIToUTF16(request()->details()->total->amount->value));
 
   return base::MakeUnique<views::Label>(label_value);
 }
 
 std::unique_ptr<views::Button>
 PaymentSheetViewController::CreatePaymentSheetSummaryRow() {
   std::unique_ptr<views::Button> section = base::MakeUnique<PaymentSheetRow>(
       this,
       l10n_util::GetStringUTF16(IDS_PAYMENT_REQUEST_ORDER_SUMMARY_SECTION_NAME),
       std::unique_ptr<views::View>(nullptr),
       CreateOrderSummarySectionContent());
   section->set_tag(static_cast<int>(
       PaymentSheetViewControllerTags::SHOW_ORDER_SUMMARY_BUTTON));
   return section;
 }
 
 }  // namespace payments