[Payments] Improve the closing of the PR dialog.

chrome/browser/ui/views/payments/test_chrome_payment_request_delegate.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_PAYMENTS_TEST_CHROME_PAYMENT_REQUEST_DELEGATE_H_
 #define CHROME_BROWSER_UI_VIEWS_PAYMENTS_TEST_CHROME_PAYMENT_REQUEST_DELEGATE_H_
 
 #include "base/macros.h"
 #include "chrome/browser/payments/chrome_payment_request_delegate.h"
-#include "chrome/browser/ui/views/payments/payment_request_dialog.h"
+#include "chrome/browser/ui/views/payments/payment_request_dialog_view.h"
 
 namespace content {
 class WebContents;
 }
 
+namespace views {
+class WidgetObserver;
+}
+
 namespace payments {
 
 class PaymentRequest;
 
 // Implementation of the Payment Request delegate used in tests.
 class TestChromePaymentRequestDelegate : public ChromePaymentRequestDelegate {
  public:
   TestChromePaymentRequestDelegate(
       content::WebContents* web_contents,
-      PaymentRequestDialog::ObserverForTest* observer);
+      PaymentRequestDialogView::ObserverForTest* observer,
+      views::WidgetObserver* widget_observer);
 
-  void ShowPaymentRequestDialog(PaymentRequest* request) override;
+  void ShowDialog(PaymentRequest* request) override;
 
  private:
-  PaymentRequestDialog::ObserverForTest* observer_;
+  PaymentRequestDialogView::ObserverForTest* observer_;
+  views::WidgetObserver* widget_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(TestChromePaymentRequestDelegate);
 };
 
 }  // namespace payments
 
 #endif  // CHROME_BROWSER_UI_VIEWS_PAYMENTS_TEST_CHROME_PAYMENT_REQUEST_DELEGATE_H_