[Payments] View controllers no longer have access to PaymentRequest

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

 // Copyright 2017 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/credit_card_editor_view_controller.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 10 matching lines @@
 #include "chrome/browser/ui/views/payments/validating_textfield.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/autofill/core/browser/autofill_data_util.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/browser/validation.h"
 #include "components/autofill/core/common/autofill_clock.h"
 #include "components/autofill/core/common/autofill_constants.h"
-#include "components/payments/content/payment_request.h"
 #include "components/payments/content/payment_request_spec.h"
+#include "components/payments/content/payment_request_state.h"
 #include "components/strings/grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/view.h"
 
 namespace payments {
@@ skipping 30 matching lines @@
   autofill::AutofillClock::Now().LocalExplode(&now_exploded);
   for (int i = 0; i < kNumberOfExpirationYears; i++) {
     years.push_back(base::UTF8ToUTF16(std::to_string(now_exploded.year + i)));
   }
   return years;
 }
 
 }  // namespace
 
 CreditCardEditorViewController::CreditCardEditorViewController(
-    PaymentRequest* request,
+    PaymentRequestSpec* spec,
+    PaymentRequestState* state,
     PaymentRequestDialogView* dialog)
-    : EditorViewController(request, dialog) {}
+    : EditorViewController(spec, state, dialog) {}
 
 CreditCardEditorViewController::~CreditCardEditorViewController() {}
 
 // Creates the "Cards accepted" view with a row of icons at the top of the
 // credit card editor.
 // +----------------------------------------------+
 // | Cards Accepted                               |
 // |                                              |
 // | | VISA | | MC | | AMEX |                     |
 // +----------------------------------------------+
@@ skipping 21 matching lines @@
 
   // 8dp padding is required between icons.
   constexpr int kPaddingBetweenCardIcons = 8;
   std::unique_ptr<views::View> icons_row = base::MakeUnique<views::View>();
   views::BoxLayout* icons_layout = new views::BoxLayout(
       views::BoxLayout::kHorizontal, 0, 0, kPaddingBetweenCardIcons);
   icons_row->SetLayoutManager(icons_layout);
 
   constexpr gfx::Size kCardIconSize = gfx::Size(30, 18);
   for (const std::string& supported_network :
-       request()->spec()->supported_card_networks()) {
+       spec()->supported_card_networks()) {
     const std::string autofill_card_type =
         autofill::data_util::GetCardTypeForBasicCardPaymentType(
             supported_network);
     std::unique_ptr<views::ImageView> card_icon_view =
         CreateCardIconView(autofill_card_type);
     card_icon_view->SetImageSize(kCardIconSize);
 
     icons_row->AddChildView(card_icon_view.release());
   }
   view->AddChildView(icons_row.release());
@@ skipping 45 matching lines @@
 
     credit_card.SetRawInfo(field.second.type,
                            combobox->GetTextForRow(combobox->selected_index()));
   }
 
   // TODO(mathp): Display global error message.
   if (!credit_card.IsValid())
     return false;
 
   // Add the card (will not add a duplicate).
-  request()->state()->GetPersonalDataManager()->AddCreditCard(credit_card);
+  state()->GetPersonalDataManager()->AddCreditCard(credit_card);
 
   return true;
 }
 
 std::unique_ptr<ValidationDelegate>
 CreditCardEditorViewController::CreateValidationDelegate(
     const EditorField& field) {
   // The supported card networks for non-cc-number types are not passed to avoid
   // the data copy in the delegate.
   return base::MakeUnique<
       CreditCardEditorViewController::CreditCardValidationDelegate>(
       field, this,
       field.type == autofill::CREDIT_CARD_NUMBER
-          ? request()->spec()->supported_card_networks()
+          ? spec()->supported_card_networks()
           : std::vector<std::string>());
 }
 
 std::unique_ptr<ui::ComboboxModel>
 CreditCardEditorViewController::GetComboboxModelForType(
     const autofill::ServerFieldType& type) {
   switch (type) {
     case autofill::CREDIT_CARD_EXP_MONTH: {
       int default_index = 0;
       std::vector<base::string16> months =
@@ skipping 49 matching lines @@
   bool is_required_valid = !field_.required;
   const base::string16 displayed_message =
       is_required_valid ? base::ASCIIToUTF16("")
                         : l10n_util::GetStringUTF16(
                               IDS_PAYMENTS_FIELD_REQUIRED_VALIDATION_MESSAGE);
   controller_->DisplayErrorMessageForField(field_, displayed_message);
   return is_required_valid;
 }
 
 }  // namespace payments