[Payments] Fix bug in shipping option selection.

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"
@@ skipping 166 matching lines @@
 }
 
 void PaymentRequestDialogView::ShowShippingProfileSheet() {
   view_stack_.Push(
       CreateViewAndInstallController(
           ProfileListViewController::GetShippingProfileViewController(
               request_->spec(), request_->state(), this),
           &controller_map_),
       /* animate = */ true);
   if (observer_for_testing_)
-    observer_for_testing_->OnShippingSectionOpened();
+    observer_for_testing_->OnShippingAddressSectionOpened();
 }
 
 void PaymentRequestDialogView::ShowShippingOptionSheet() {
   view_stack_.Push(CreateViewAndInstallController(
                        base::MakeUnique<ShippingOptionViewController>(
                            request_->spec(), request_->state(), this),
                        &controller_map_),
                    /* animate = */ true);
+  if (observer_for_testing_)
+    observer_for_testing_->OnShippingOptionSectionOpened();
 }
 
 void PaymentRequestDialogView::ShowCvcUnmaskPrompt(
     const autofill::CreditCard& credit_card,
     base::WeakPtr<autofill::payments::FullCardRequest::ResultDelegate>
         result_delegate,
     content::WebContents* web_contents) {
   view_stack_.Push(CreateViewAndInstallController(
                        base::MakeUnique<CvcUnmaskViewController>(
                            request_->spec(), request_->state(), this,
@@ skipping 94 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