[Payments] Convert interactive tests to browsertests

chrome/browser/ui/views/payments/payment_request_browsertest.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 <vector>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/browser_commands.h"
+#include "chrome/browser/ui/views/payments/payment_request_browsertest_base.h"
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h"
-#include "chrome/browser/ui/views/payments/payment_request_interactive_uitest_base.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/payments/content/payment_request.h"
 #include "components/payments/content/payment_request_web_contents_manager.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/test/browser_test_utils.h"
 
 namespace payments {
 
 class PaymentRequestWebContentsManagerTest
-    : public PaymentRequestInteractiveTestBase {
+    : public PaymentRequestBrowserTestBase {
  protected:
   PaymentRequestWebContentsManagerTest()
-      : PaymentRequestInteractiveTestBase(
+      : PaymentRequestBrowserTestBase(
             "/payment_request_multiple_requests.html") {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PaymentRequestWebContentsManagerTest);
 };
 
 // If the page creates multiple PaymentRequest objects, it should not crash.
 IN_PROC_BROWSER_TEST_F(PaymentRequestWebContentsManagerTest, MultipleRequests) {
   const std::vector<PaymentRequest*> payment_requests =
       GetPaymentRequests(GetActiveWebContents());
   EXPECT_EQ(5U, payment_requests.size());
 }
 
-class PaymentRequestNoShippingTest : public PaymentRequestInteractiveTestBase {
+class PaymentRequestNoShippingTest : public PaymentRequestBrowserTestBase {
  protected:
   PaymentRequestNoShippingTest()
-      : PaymentRequestInteractiveTestBase(
+      : PaymentRequestBrowserTestBase(
             "/payment_request_no_shipping_test.html") {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PaymentRequestNoShippingTest);
 };
 
 IN_PROC_BROWSER_TEST_F(PaymentRequestNoShippingTest,
                        OpenAndNavigateToOrderSummary) {
   InvokePaymentRequestUI();
 
@@ skipping 34 matching lines @@
 IN_PROC_BROWSER_TEST_F(PaymentRequestNoShippingTest, OpenAndReload) {
   InvokePaymentRequestUI();
 
   ResetEventObserver(DialogEvent::DIALOG_CLOSED);
 
   chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
 
   WaitForObservedEvent();
 }
 
-class PaymentRequestAbortTest : public PaymentRequestInteractiveTestBase {
+class PaymentRequestAbortTest : public PaymentRequestBrowserTestBase {
  protected:
   PaymentRequestAbortTest()
-      : PaymentRequestInteractiveTestBase("/payment_request_abort_test.html") {}
+      : PaymentRequestBrowserTestBase("/payment_request_abort_test.html") {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PaymentRequestAbortTest);
 };
 
 // Testing the use of the abort() JS API.
 IN_PROC_BROWSER_TEST_F(PaymentRequestAbortTest, OpenThenAbort) {
   InvokePaymentRequestUI();
 
   ResetEventObserver(DialogEvent::DIALOG_CLOSED);
 
   content::WebContents* web_contents = GetActiveWebContents();
   const std::string click_buy_button_js =
       "(function() { document.getElementById('abort').click(); })();";
   ASSERT_TRUE(content::ExecuteScript(web_contents, click_buy_button_js));
 
   WaitForObservedEvent();
 
   // The web-modal dialog should now be closed.
   web_modal::WebContentsModalDialogManager* web_contents_modal_dialog_manager =
       web_modal::WebContentsModalDialogManager::FromWebContents(web_contents);
   EXPECT_FALSE(web_contents_modal_dialog_manager->IsDialogActive());
 }
 
 }  // namespace payments