components/cronet/android/test/javatests/src/org/chromium/net/CriteriaHelper.java - Issue 884003004: Rename org.chromium.cronet_test_apk to org.chromium.net

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: components/cronet/android/test/javatests/src/org/chromium/net/CriteriaHelper.java

Issue 884003004: Rename org.chromium.cronet_test_apk to org.chromium.net (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased Created 5 years, 10 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 | « components/cronet/android/test/javatests/src/org/chromium/net/Criteria.java ('k') | components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/cronet/android/test/javatests/src/org/chromium/net/CriteriaHelper.java

diff --git a/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/CriteriaHelper.java b/components/cronet/android/test/javatests/src/org/chromium/net/CriteriaHelper.java

similarity index 95%

rename from components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/CriteriaHelper.java

rename to components/cronet/android/test/javatests/src/org/chromium/net/CriteriaHelper.java

index 027fa84fa6a51fb2c46cdf368308bb7f34f56425..0e2a4cacf40a03ea5361048dfd00f84a07493be5 100644

--- a/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/CriteriaHelper.java

+++ b/components/cronet/android/test/javatests/src/org/chromium/net/CriteriaHelper.java

@@ -2,7 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-package org.chromium.cronet_test_apk;

+package org.chromium.net;

import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout;

@@ -42,8 +42,8 @@ public class CriteriaHelper {

long checkIntervalMs) throws InterruptedException {

boolean isSatisfied = criteria.isSatisfied();

long startTime = SystemClock.uptimeMillis();

- while (!isSatisfied &&

- SystemClock.uptimeMillis() - startTime < maxTimeoutMs) {

+ while (!isSatisfied

+ && SystemClock.uptimeMillis() - startTime < maxTimeoutMs) {

Thread.sleep(checkIntervalMs);

isSatisfied = criteria.isSatisfied();

}