Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1432)

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

Issue 2859613002: Disable web payments API on blob: and data: schemes. (Closed)
Patch Set: Fix up Android test Created 3 years, 7 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
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 02bae8717c630f778a40c245217d1fc1cfbd4540..c29b24c5337a9160cff817f9d90576954d554848 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
@@ -128,8 +128,10 @@ abstract class PaymentRequestTestBase extends ChromeActivityTestCaseBase<ChromeT
mCanMakePaymentQueryResponded = new CallbackHelper();
mViewCoreRef = new AtomicReference<>();
mWebContentsRef = new AtomicReference<>();
- mTestFilePath = UrlUtils.getIsolatedTestFilePath(
- String.format("chrome/test/data/payments/%s", testFileName));
+ mTestFilePath = testFileName.startsWith("data:")
+ ? testFileName
+ : UrlUtils.getIsolatedTestFilePath(
+ String.format("chrome/test/data/payments/%s", testFileName));
}
@Override
@@ -159,6 +161,17 @@ abstract class PaymentRequestTestBase extends ChromeActivityTestCaseBase<ChromeT
protected void openPageAndClickNodeAndWait(String nodeId, CallbackHelper helper)
throws InterruptedException, ExecutionException, TimeoutException {
+ openPage();
+ clickNodeAndWait(nodeId, helper);
+ }
+
+ protected void openPageAndClickNode(String nodeId)
+ throws InterruptedException, ExecutionException, TimeoutException {
+ openPage();
+ DOMUtils.clickNode(mViewCoreRef.get(), nodeId);
+ }
+
+ private void openPage() throws InterruptedException, ExecutionException, TimeoutException {
onMainActivityStarted();
ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@Override
@@ -171,7 +184,6 @@ abstract class PaymentRequestTestBase extends ChromeActivityTestCaseBase<ChromeT
}
});
assertWaitForPageScaleFactorMatch(1);
- clickNodeAndWait(nodeId, helper);
}
protected void reTriggerUIAndWait(

Powered by Google App Engine
This is Rietveld 408576698