Revert of [Payments] Normalize Shipping Address sent to merchant on Desktop.

components/payments/content/payment_request_state.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_state.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 62 matching lines @@
 
 void PaymentRequestState::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void PaymentRequestState::GeneratePaymentResponse() {
   DCHECK(is_ready_to_pay());
 
   // Once the response is ready, will call back into OnPaymentResponseReady.
   response_helper_ = base::MakeUnique<PaymentResponseHelper>(
-      app_locale_, spec_, selected_instrument_, payment_request_delegate_,
-      selected_shipping_profile_, selected_contact_profile_, this);
+      app_locale_, spec_, selected_instrument_, selected_shipping_profile_,
+      selected_contact_profile_, this);
 }
 
 void PaymentRequestState::AddAutofillPaymentInstrument(
     bool selected,
     const autofill::CreditCard& card) {
   std::string basic_card_network =
       autofill::data_util::GetPaymentRequestData(card.type())
           .basic_card_payment_type;
   if (!spec_->supported_card_networks_set().count(basic_card_network))
     return;
@@ skipping 141 matching lines @@
 bool PaymentRequestState::ArePaymentOptionsSatisfied() {
   // TODO(mathp): Have a measure of shipping address completeness.
   if (spec_->request_shipping() && selected_shipping_profile_ == nullptr)
     return false;
 
   profile_util::PaymentsProfileComparator comparator(app_locale_, *spec_);
   return comparator.IsContactInfoComplete(selected_contact_profile_);
 }
 
 }  // namespace payments