Remove FullCardRequest's dependency on AutofillClient.

components/autofill/core/browser/payments/full_card_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/autofill/core/browser/payments/full_card_request.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "components/autofill/core/browser/autofill_metrics.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/common/autofill_clock.h"
 
 namespace autofill {
 namespace payments {
 
-FullCardRequest::FullCardRequest(AutofillClient* autofill_client,
+FullCardRequest::FullCardRequest(RiskDataLoader* risk_data_loader,
                                  payments::PaymentsClient* payments_client,
                                  PersonalDataManager* personal_data_manager)
-    : autofill_client_(autofill_client),
+    : risk_data_loader_(risk_data_loader),
       payments_client_(payments_client),
       personal_data_manager_(personal_data_manager),
       result_delegate_(nullptr),
       ui_delegate_(nullptr),
       should_unmask_card_(false),
       weak_ptr_factory_(this) {
-  DCHECK(autofill_client_);
+  DCHECK(risk_data_loader_);
   DCHECK(payments_client_);
   DCHECK(personal_data_manager_);
 }
 
 FullCardRequest::~FullCardRequest() {}
 
 void FullCardRequest::GetFullCard(const CreditCard& card,
                                   AutofillClient::UnmaskCardReason reason,
                                   base::WeakPtr<ResultDelegate> result_delegate,
                                   base::WeakPtr<UIDelegate> ui_delegate) {
@@ skipping 15 matching lines @@
   should_unmask_card_ = card.record_type() == CreditCard::MASKED_SERVER_CARD ||
                         (card.record_type() == CreditCard::FULL_SERVER_CARD &&
                          card.ShouldUpdateExpiration(AutofillClock::Now()));
   if (should_unmask_card_)
     payments_client_->Prepare();
 
   ui_delegate_->ShowUnmaskPrompt(request_->card, reason,
                                  weak_ptr_factory_.GetWeakPtr());
 
   if (should_unmask_card_) {
-    autofill_client_->LoadRiskData(
+    risk_data_loader_->LoadRiskData(
         base::Bind(&FullCardRequest::OnDidGetUnmaskRiskData,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 }
 
 bool FullCardRequest::IsGettingFullCard() const {
   return !!request_;
 }
 
 void FullCardRequest::OnUnmaskResponse(const UnmaskResponse& response) {
@@ skipping 91 matching lines @@
   weak_ptr_factory_.InvalidateWeakPtrs();
   payments_client_->CancelRequest();
   result_delegate_ = nullptr;
   ui_delegate_ = nullptr;
   request_.reset();
   should_unmask_card_ = false;
 }
 
 }  // namespace payments
 }  // namespace autofill