[Payments] Improve the closing of the PR dialog.

chrome/browser/ui/views/payments/payment_request_interactive_uitest_base.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_interactive_uitest_base.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 45 matching lines @@
   registry->AddInterface(base::Bind(
       &PaymentRequestInteractiveTestBase::CreatePaymentRequestForTest,
       base::Unretained(this), web_contents));
 }
 
 void PaymentRequestInteractiveTestBase::OnDialogOpened() {
   if (event_observer_)
     event_observer_->Observe(DialogEvent::DIALOG_OPENED);
 }
 
+void PaymentRequestInteractiveTestBase::OnWidgetDestroyed(
+    views::Widget* widget) {
+  if (event_observer_)
+    event_observer_->Observe(DialogEvent::DIALOG_CLOSED);
+}
+
 void PaymentRequestInteractiveTestBase::InvokePaymentRequestUI() {
   event_observer_.reset(new DialogEventObserver(DialogEvent::DIALOG_OPENED));
 
   content::WebContents* web_contents = GetActiveWebContents();
   const std::string click_buy_button_js =
       "(function() { document.getElementById('buy').click(); })();";
   ASSERT_TRUE(content::ExecuteScript(web_contents, click_buy_button_js));
 
   event_observer_->Wait();
 
@@ skipping 20 matching lines @@
   for (const auto& p : manager->payment_requests_)
     payment_requests_ptrs.push_back(p.first);
   return payment_requests_ptrs;
 }
 
 void PaymentRequestInteractiveTestBase::CreatePaymentRequestForTest(
     content::WebContents* web_contents,
     mojo::InterfaceRequest<payments::mojom::PaymentRequest> request) {
   DCHECK(web_contents);
   PaymentRequestWebContentsManager::GetOrCreateForWebContents(web_contents)
-      ->CreatePaymentRequest(web_contents,
-                             base::MakeUnique<TestChromePaymentRequestDelegate>(
-                                 web_contents, this /* observer */),
-                             std::move(request));
+      ->CreatePaymentRequest(
+          web_contents,
+          base::MakeUnique<TestChromePaymentRequestDelegate>(
+              web_contents, this /* observer */, this /* widget_observer */),
+          std::move(request));
 }
 
 PaymentRequestInteractiveTestBase::DialogEventObserver::DialogEventObserver(
     PaymentRequestInteractiveTestBase::DialogEvent event)
     : event_(event), seen_(false) {}
 PaymentRequestInteractiveTestBase::DialogEventObserver::~DialogEventObserver() {
 }
 
 void PaymentRequestInteractiveTestBase::DialogEventObserver::Wait() {
   if (seen_)
     return;
 
   DCHECK(!run_loop_.running());
   run_loop_.Run();
 }
 
 void PaymentRequestInteractiveTestBase::DialogEventObserver::Observe(
     PaymentRequestInteractiveTestBase::DialogEvent event) {
+  if (seen_)
+    return;
+
+  DCHECK_EQ(event_, event);
   seen_ = true;
-  if (event == event_ && run_loop_.running())
+  if (run_loop_.running())
     run_loop_.Quit();
 }
 
+void PaymentRequestInteractiveTestBase::ResetEventObserver(DialogEvent event) {
+  event_observer_.reset(new DialogEventObserver(event));
+}
+
+void PaymentRequestInteractiveTestBase::WaitForObservedEvent() {
+  event_observer_->Wait();
+}
+
 }  // namespace payments