[Web Payments] Fix some ScrollView issues in the dialog.

chrome/browser/ui/views/payments/payment_request_sheet_controller.cc

 // Copyright 2017 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_sheet_controller.h"
 
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view.h"
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h"
 #include "chrome/browser/ui/views/payments/payment_request_views_util.h"
 #include "components/payments/content/payment_request.h"
@@ skipping 23 matching lines @@
   FillContentView(content_view_);
 
   return CreatePaymentView();
 }
 
 void PaymentRequestSheetController::UpdateContentView() {
   content_view_->RemoveAllChildViews(true);
   FillContentView(content_view_);
   content_view_->Layout();
   pane_->SizeToPreferredSize();
+  // Now that the content and its surrounding pane are updated, force a Layout
+  // on the ScrollView so that it updates its scroll bars now.
+  scroll_->Layout();
 }
 
 std::unique_ptr<views::Button>
 PaymentRequestSheetController::CreatePrimaryButton() {
   return nullptr;
 }
 
 base::string16 PaymentRequestSheetController::GetSecondaryButtonLabel() {
   return l10n_util::GetStringUTF16(IDS_CANCEL);
 }
@@ skipping 56 matching lines @@
   views::GridLayout* pane_layout = new views::GridLayout(pane_);
   views::ColumnSet* pane_columns = pane_layout->AddColumnSet(0);
   pane_columns->AddColumn(
       views::GridLayout::Alignment::FILL, views::GridLayout::Alignment::LEADING,
       0, views::GridLayout::SizeType::FIXED, kDialogWidth, kDialogWidth);
   pane_->SetLayoutManager(pane_layout);
   pane_layout->StartRow(0, 0);
   pane_layout->AddView(content_view_);
   pane_->SizeToPreferredSize();
 
-  std::unique_ptr<views::ScrollView> scroll =
-      base::MakeUnique<views::ScrollView>();
-  scroll->EnableViewPortLayer();
-  scroll->set_hide_horizontal_scrollbar(true);
-  scroll->SetContents(pane_);
-  layout->AddView(scroll.release());
+  scroll_ = base::MakeUnique<views::ScrollView>();
+  scroll_->set_owned_by_client();
+  scroll_->EnableViewPortLayer();
+  scroll_->set_hide_horizontal_scrollbar(true);
+  scroll_->SetContents(pane_);
+  layout->AddView(scroll_.get());
 
   layout->StartRow(0, 0);
   layout->AddView(CreateFooterView().release());
 
   return view;
 }
 
 std::unique_ptr<views::View> PaymentRequestSheetController::CreateFooterView() {
   std::unique_ptr<views::View> container = base::MakeUnique<views::View>();
 
@@ skipping 37 matching lines @@
   button->set_tag(static_cast<int>(PaymentRequestCommonTags::CLOSE_BUTTON_TAG));
   button->set_id(static_cast<int>(DialogViewID::CANCEL_BUTTON));
   trailing_buttons_container->AddChildView(button);
 
   layout->AddView(trailing_buttons_container.release());
 
   return container;
 }
 
 }  // namespace payments