[Payments] Move PaymentResponse logic to PaymentResponseHelper.

components/payments/content/payment_request_state.h

 // 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.
 
 #ifndef COMPONENTS_PAYMENTS_CONTENT_PAYMENT_REQUEST_STATE_H_
 #define COMPONENTS_PAYMENTS_CONTENT_PAYMENT_REQUEST_STATE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "components/payments/content/payment_request.mojom.h"
-#include "components/payments/core/autofill_payment_instrument.h"
-#include "components/payments/core/payment_instrument.h"
+#include "components/payments/content/payment_response_helper.h"
 
 namespace autofill {
 class AutofillProfile;
 class PersonalDataManager;
 }  // namespace autofill
 
 namespace payments {
 
+class PaymentInstrument;
 class PaymentRequestDelegate;
 class PaymentRequestSpec;
 
 // Keeps track of the information currently selected by the user and whether the
 // user is ready to pay. Uses information from the PaymentRequestSpec, which is
 // what the merchant has specified, as input into the "is ready to pay"
 // computation.
-class PaymentRequestState : public PaymentInstrument::Delegate {
+class PaymentRequestState : public PaymentResponseHelper::Delegate {
  public:
   // Any class call add itself as Observer via AddObserver() and receive
   // notification about the state changing.
   class Observer {
    public:
     // Called when the information (payment method, address/contact info,
     // shipping option) changes.
     virtual void OnSelectedInformationChanged() = 0;
 
    protected:
@@ skipping 17 matching lines @@
     virtual ~Delegate() {}
   };
 
   PaymentRequestState(PaymentRequestSpec* spec,
                       Delegate* delegate,
                       const std::string& app_locale,
                       autofill::PersonalDataManager* personal_data_manager,
                       PaymentRequestDelegate* payment_request_delegate);
   ~PaymentRequestState() override;
 
+  // PaymentResponseHelper::Delegate
+  void OnPaymentResponseReady(
+      mojom::PaymentResponsePtr payment_response) override;
+
   // Returns whether the user has at least one instrument that satisfies the
   // specified supported payment methods.
   bool CanMakePayment() const;
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
-  // PaymentInstrument::Delegate:
-  void OnInstrumentDetailsReady(
-      const std::string& method_name,
-      const std::string& stringified_details) override;
-  void OnInstrumentDetailsError() override {}
-
   // Initiates the generation of the PaymentResponse. Callers should check
   // |is_ready_to_pay|, which is inexpensive.
   void GeneratePaymentResponse();
 
   // Gets the Autofill Profile representing the shipping address or contact
   // information currently selected for this PaymentRequest flow. Can return
   // null.
   autofill::AutofillProfile* selected_shipping_profile() const {
     return selected_shipping_profile_;
   }
@@ skipping 76 matching lines @@
   // loading and owned here. They are populated once only, and ordered by
   // frecency.
   std::vector<std::unique_ptr<autofill::AutofillProfile>> profile_cache_;
   std::vector<autofill::AutofillProfile*> shipping_profiles_;
   std::vector<autofill::AutofillProfile*> contact_profiles_;
   // Credit cards are directly owned by the instruments in this list.
   std::vector<std::unique_ptr<PaymentInstrument>> available_instruments_;
 
   PaymentRequestDelegate* payment_request_delegate_;
 
+  std::unique_ptr<PaymentResponseHelper> response_helper_;
+
   base::ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(PaymentRequestState);
 };
 
 }  // namespace payments
 
 #endif  // COMPONENTS_PAYMENTS_CONTENT_PAYMENT_REQUEST_STATE_H_