chrome/android/java_sources.gni - Issue 2755643002: Revert of Move UrlManagerTest to junit

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/java_sources.gni

Issue 2755643002: Revert of Move UrlManagerTest to junit (Closed)

Patch Set: resolve conflict Created 3 years, 9 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:

Index: chrome/android/java_sources.gni

diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni

index 5a528bb5ecc645c81b3b6edcbbb5296e8f722dc2..95f20e97e27a542bbe9f88069e124b8027f28ba2 100644

--- a/chrome/android/java_sources.gni

+++ b/chrome/android/java_sources.gni

@@ -1396,6 +1396,8 @@ chrome_test_java_sources = [

"javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerDisableIncognitoModeUnitTest.java",

"javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerHomepageIntegrationTest.java",

"javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerHomepageUnitTest.java",

+ "javatests/src/org/chromium/chrome/browser/physicalweb/MockPwsClient.java",

+ "javatests/src/org/chromium/chrome/browser/physicalweb/UrlManagerTest.java",

"javatests/src/org/chromium/chrome/browser/policy/CombinedPolicyProviderTest.java",

"javatests/src/org/chromium/chrome/browser/payments/CurrencyFormatterTest.java",

"javatests/src/org/chromium/chrome/browser/payments/PaymentRequestAbortTest.java",

@@ -1615,11 +1617,9 @@ chrome_junit_test_java_sources = [

"junit/src/org/chromium/chrome/browser/payments/AutofillContactTest.java",

"junit/src/org/chromium/chrome/browser/payments/AutofillContactUnitTest.java",

"junit/src/org/chromium/chrome/browser/payments/PaymentManifestVerifierTest.java",

- "junit/src/org/chromium/chrome/browser/physicalweb/MockPwsClient.java",

"junit/src/org/chromium/chrome/browser/physicalweb/PwsClientImplTest.java",

"junit/src/org/chromium/chrome/browser/physicalweb/PwsResultTest.java",

"junit/src/org/chromium/chrome/browser/physicalweb/UrlInfoTest.java",

- "junit/src/org/chromium/chrome/browser/physicalweb/UrlManagerTest.java",

"junit/src/org/chromium/chrome/browser/snackbar/SnackbarCollectionUnitTest.java",

"junit/src/org/chromium/chrome/browser/suggestions/TileGroupTest.java",

"junit/src/org/chromium/chrome/browser/suggestions/TileTest.java",

« no previous file with comments | « no previous file | chrome/android/javatests/src/org/chromium/chrome/browser/physicalweb/MockPwsClient.java » ('j') | no next file with comments »