[WebPayments] Extracting common code from Shipping + Contact Info views.

chrome/browser/ui/views/payments/payment_request_dialog_view.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 "chrome/browser/ui/views/payments/payment_request_dialog_view.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
-#include "chrome/browser/ui/views/payments/contact_info_view_controller.h"
 #include "chrome/browser/ui/views/payments/credit_card_editor_view_controller.h"
 #include "chrome/browser/ui/views/payments/order_summary_view_controller.h"
 #include "chrome/browser/ui/views/payments/payment_method_view_controller.h"
 #include "chrome/browser/ui/views/payments/payment_sheet_view_controller.h"
-#include "chrome/browser/ui/views/payments/shipping_list_view_controller.h"
+#include "chrome/browser/ui/views/payments/profile_list_view_controller.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "components/payments/content/payment_request.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/views/layout/fill_layout.h"
 
 namespace chrome {
 
 payments::PaymentRequestDialog* CreatePaymentRequestDialog(
     payments::PaymentRequest* request) {
   return new payments::PaymentRequestDialogView(request,
@@ skipping 67 matching lines @@
   return ui::DIALOG_BUTTON_NONE;
 }
 
 void PaymentRequestDialogView::GoBack() {
   view_stack_.Pop();
 
   if (observer_for_testing_)
     observer_for_testing_->OnBackNavigation();
 }
 
-void PaymentRequestDialogView::ShowContactInfoSheet() {
+void PaymentRequestDialogView::ShowContactProfileSheet() {
   view_stack_.Push(
       CreateViewAndInstallController(
-          base::MakeUnique<ContactInfoViewController>(request_, this),
+          ProfileListViewController::GetContactProfileViewController(request_,
+                                                                     this),
           &controller_map_),
       /* animate */ true);
   if (observer_for_testing_)
     observer_for_testing_->OnContactInfoOpened();
 }
 
 void PaymentRequestDialogView::ShowOrderSummary() {
   view_stack_.Push(
       CreateViewAndInstallController(
           base::MakeUnique<OrderSummaryViewController>(request_, this),
           &controller_map_),
       /* animate = */ true);
   if (observer_for_testing_)
     observer_for_testing_->OnOrderSummaryOpened();
 }
 
 void PaymentRequestDialogView::ShowPaymentMethodSheet() {
   view_stack_.Push(
       CreateViewAndInstallController(
           base::MakeUnique<PaymentMethodViewController>(request_, this),
           &controller_map_),
       /* animate = */ true);
   if (observer_for_testing_)
     observer_for_testing_->OnPaymentMethodOpened();
 }
 
-void PaymentRequestDialogView::ShowShippingListSheet() {
+void PaymentRequestDialogView::ShowShippingProfileSheet() {
   view_stack_.Push(
       CreateViewAndInstallController(
-          base::MakeUnique<ShippingListViewController>(request_, this),
+          ProfileListViewController::GetShippingProfileViewController(request_,
+                                                                      this),
           &controller_map_),
       /* animate = */ true);
 }
 
 void PaymentRequestDialogView::ShowCreditCardEditor() {
   view_stack_.Push(
       CreateViewAndInstallController(
           base::MakeUnique<CreditCardEditorViewController>(request_, this),
           &controller_map_),
       /* animate = */ true);
@@ skipping 33 matching lines @@
   // When a view that is associated with a controller is removed from this
   // view's descendants, dispose of the controller.
   if (!details.is_add &&
       controller_map_.find(details.child) != controller_map_.end()) {
     DCHECK(!details.move_view);
     controller_map_.erase(details.child);
   }
 }
 
 }  // namespace payments