chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.java - Issue 2428163002: Refactor CallbackHelper to base/test

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.java

Issue 2428163002: Refactor CallbackHelper to base/test (Closed)

Patch Set: Change ui test gn Created 4 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerHomepageIntegrationTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/preferences/PreferencesTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.java b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.java

index 8b0c0ae3b7524970a9c79fda3f8609edf86b4338..417b66363e538f0a934aa9884dbe142e7ece3bf5 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.java

@@ -11,7 +11,10 @@ import android.widget.CheckBox;

import android.widget.EditText;

import android.widget.Spinner;

+import org.json.JSONObject;

import org.chromium.base.ThreadUtils;

+import org.chromium.base.test.util.CallbackHelper;

import org.chromium.base.test.util.RetryOnFailure;

import org.chromium.base.test.util.UrlUtils;

import org.chromium.chrome.R;

@@ -27,13 +30,11 @@ import org.chromium.chrome.browser.payments.ui.PaymentRequestUI;

import org.chromium.chrome.browser.payments.ui.PaymentRequestUI.PaymentRequestObserverForTest;

import org.chromium.chrome.test.ChromeActivityTestCaseBase;

import org.chromium.content.browser.ContentViewCore;

-import org.chromium.content.browser.test.util.CallbackHelper;

import org.chromium.content.browser.test.util.Criteria;

import org.chromium.content.browser.test.util.CriteriaHelper;

import org.chromium.content.browser.test.util.DOMUtils;

import org.chromium.content_public.browser.WebContents;

import org.chromium.payments.mojom.PaymentItem;

-import org.json.JSONObject;

import java.util.ArrayList;

import java.util.HashSet;