[Payments] Move PersonalDataManager and locale to PaymentRequestState

components/payments/content/payment_request.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 "components/payments/content/payment_request.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
-#include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/payments/content/payment_details_validation.h"
 #include "components/payments/content/payment_request_web_contents_manager.h"
-#include "components/payments/core/currency_formatter.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 
 namespace payments {
 
 PaymentRequest::PaymentRequest(
     content::WebContents* web_contents,
     std::unique_ptr<PaymentRequestDelegate> delegate,
     PaymentRequestWebContentsManager* manager,
     mojo::InterfaceRequest<payments::mojom::PaymentRequest> request)
@@ skipping 19 matching lines @@
     payments::mojom::PaymentOptionsPtr options) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   std::string error;
   if (!payments::validatePaymentDetails(details, &error)) {
     LOG(ERROR) << error;
     OnConnectionTerminated();
     return;
   }
   client_ = std::move(client);
   spec_ = base::MakeUnique<PaymentRequestSpec>(
-      std::move(options), std::move(details), std::move(method_data), this);
-  state_ = base::MakeUnique<PaymentRequestState>(spec_.get(), this);
+      std::move(options), std::move(details), std::move(method_data), this,
+      delegate_->GetApplicationLocale());
+  state_ = base::MakeUnique<PaymentRequestState>(
+      spec_.get(), this, delegate_->GetApplicationLocale(),
+      delegate_->GetPersonalDataManager());
 }
 
 void PaymentRequest::Show() {
   if (!client_.is_bound() || !binding_.is_bound()) {
     LOG(ERROR) << "Attempted Show(), but binding(s) missing.";
     OnConnectionTerminated();
     return;
   }
   delegate_->ShowDialog(this);
 }
@@ skipping 19 matching lines @@
 
 void PaymentRequest::CanMakePayment() {
   // TODO(mathp): Return whether we can make payment.
   client_->OnCanMakePayment(mojom::CanMakePaymentQueryResult::CAN_MAKE_PAYMENT);
 }
 
 void PaymentRequest::OnInvalidSpecProvided() {
   OnConnectionTerminated();
 }
 
-const std::string& PaymentRequest::GetApplicationLocale() {
-  return delegate_->GetApplicationLocale();
-}
-
-autofill::PersonalDataManager* PaymentRequest::GetPersonalDataManager() {
-  return delegate_->GetPersonalDataManager();
-}
-
 void PaymentRequest::OnPaymentResponseAvailable(
     mojom::PaymentResponsePtr response) {
   client_->OnPaymentResponse(std::move(response));
 }
 
 void PaymentRequest::UserCancelled() {
   // If |client_| is not bound, then the object is already being destroyed as
   // a result of a renderer event.
   if (!client_.is_bound())
     return;
@@ skipping 18 matching lines @@
   delegate_->CloseDialog();
   manager_->DestroyRequest(this);
 }
 
 void PaymentRequest::Pay() {
   DCHECK(state_->is_ready_to_pay());
 
   state_->GeneratePaymentResponse();
 }
 
-CurrencyFormatter* PaymentRequest::GetOrCreateCurrencyFormatter(
-    const std::string& currency_code,
-    const std::string& currency_system,
-    const std::string& locale_name) {
-  if (!currency_formatter_) {
-    currency_formatter_.reset(
-        new CurrencyFormatter(currency_code, currency_system, locale_name));
-  }
-  return currency_formatter_.get();
-}
-
-base::string16 PaymentRequest::GetFormattedCurrencyAmount(
-    const std::string& amount) {
-  CurrencyFormatter* formatter = GetOrCreateCurrencyFormatter(
-      spec_->details().total->amount->currency,
-      spec_->details().total->amount->currency_system, GetApplicationLocale());
-  return formatter->Format(amount);
-}
-
-std::string PaymentRequest::GetFormattedCurrencyCode() {
-  CurrencyFormatter* formatter = GetOrCreateCurrencyFormatter(
-      spec_->details().total->amount->currency,
-      spec_->details().total->amount->currency_system, GetApplicationLocale());
-
-  return formatter->formatted_currency_code();
-}
-
 }  // namespace payments