[Payments] View controllers no longer have access to PaymentRequest

chrome/browser/ui/views/payments/order_summary_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/order_summary_view_controller.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view.h"
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h"
 #include "chrome/browser/ui/views/payments/payment_request_views_util.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/payments/content/payment_request_spec.h"
-#include "components/payments/content/payment_request_state.h"
 #include "components/payments/core/currency_formatter.h"
 #include "components/strings/grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/font.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
@@ skipping 47 matching lines @@
   amount_label->SetDefaultStyle(style_info);
   amount_label->SizeToFit(0);
   layout->AddView(amount_label.release());
 
   return row;
 }
 
 }  // namespace
 
 OrderSummaryViewController::OrderSummaryViewController(
-    PaymentRequest* request,
+    PaymentRequestSpec* spec,
+    PaymentRequestState* state,
     PaymentRequestDialogView* dialog)
-    : PaymentRequestSheetController(request, dialog), pay_button_(nullptr) {
-  request->state()->AddObserver(this);
+    : PaymentRequestSheetController(spec, state, dialog), pay_button_(nullptr) {
+  state->AddObserver(this);
 }
 
 OrderSummaryViewController::~OrderSummaryViewController() {
-  request()->state()->RemoveObserver(this);
+  state()->RemoveObserver(this);
 }
 
 std::unique_ptr<views::View> OrderSummaryViewController::CreateView() {
   std::unique_ptr<views::View> content_view = base::MakeUnique<views::View>();
 
   views::BoxLayout* layout = new views::BoxLayout(
       views::BoxLayout::kVertical, 0, 0, 0);
   layout->set_main_axis_alignment(views::BoxLayout::MAIN_AXIS_ALIGNMENT_START);
   layout->set_cross_axis_alignment(
       views::BoxLayout::CROSS_AXIS_ALIGNMENT_STRETCH);
   content_view->SetLayoutManager(layout);
 
   // Set the ID for the first few line items labels, for testing.
   const std::vector<DialogViewID> line_items{
       DialogViewID::ORDER_SUMMARY_LINE_ITEM_1,
       DialogViewID::ORDER_SUMMARY_LINE_ITEM_2,
       DialogViewID::ORDER_SUMMARY_LINE_ITEM_3};
-  for (size_t i = 0; i < request()->spec()->details().display_items.size();
-       i++) {
+  for (size_t i = 0; i < spec()->details().display_items.size(); i++) {
     DialogViewID view_id =
         i < line_items.size() ? line_items[i] : DialogViewID::VIEW_ID_NONE;
     content_view->AddChildView(
         CreateLineItemView(
-            base::UTF8ToUTF16(
-                request()->spec()->details().display_items[i]->label),
-            request()->spec()->GetFormattedCurrencyAmount(
-                request()->spec()->details().display_items[i]->amount->value),
+            base::UTF8ToUTF16(spec()->details().display_items[i]->label),
+            spec()->GetFormattedCurrencyAmount(
+                spec()->details().display_items[i]->amount->value),
             false, view_id)
             .release());
   }
 
   base::string16 total_label_value = l10n_util::GetStringFUTF16(
       IDS_PAYMENT_REQUEST_ORDER_SUMMARY_SHEET_TOTAL_FORMAT,
-      base::UTF8ToUTF16(request()->spec()->details().total->amount->currency),
-      request()->spec()->GetFormattedCurrencyAmount(
-          request()->spec()->details().total->amount->value));
+      base::UTF8ToUTF16(spec()->details().total->amount->currency),
+      spec()->GetFormattedCurrencyAmount(
+          spec()->details().total->amount->value));
 
   content_view->AddChildView(
-      CreateLineItemView(
-          base::UTF8ToUTF16(request()->spec()->details().total->label),
-          total_label_value, true,
-          DialogViewID::ORDER_SUMMARY_TOTAL_AMOUNT_LABEL)
+      CreateLineItemView(base::UTF8ToUTF16(spec()->details().total->label),
+                         total_label_value, true,
+                         DialogViewID::ORDER_SUMMARY_TOTAL_AMOUNT_LABEL)
           .release());
 
   return CreatePaymentView(
       CreateSheetHeaderView(
           true,
           l10n_util::GetStringUTF16(IDS_PAYMENT_REQUEST_ORDER_SUMMARY_TITLE),
           this),
       std::move(content_view));
 }
 
 std::unique_ptr<views::Button>
 OrderSummaryViewController::CreatePrimaryButton() {
   std::unique_ptr<views::Button> button(
       views::MdTextButton::CreateSecondaryUiBlueButton(
           this, l10n_util::GetStringUTF16(IDS_PAYMENTS_PAY_BUTTON)));
   button->set_tag(static_cast<int>(PaymentRequestCommonTags::PAY_BUTTON_TAG));
   button->set_id(static_cast<int>(DialogViewID::PAY_BUTTON));
   pay_button_ = button.get();
-  UpdatePayButtonState(request()->state()->is_ready_to_pay());
+  UpdatePayButtonState(state()->is_ready_to_pay());
   return button;
 }
 
 void OrderSummaryViewController::OnSelectedInformationChanged() {
-  UpdatePayButtonState(request()->state()->is_ready_to_pay());
+  UpdatePayButtonState(state()->is_ready_to_pay());
 }
 
 void OrderSummaryViewController::UpdatePayButtonState(bool enabled) {
   pay_button_->SetEnabled(enabled);
 }
 
 }  // namespace payments