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

Unified Diff: net/test/android/javatests/src/org/chromium/net/test/util/TestWebServer.java

Issue 1155713005: Use a resource throttle to implement shouldOverrideUrlLoading. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change XHR test and remove HandleNavigation path. Created 5 years, 6 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: net/test/android/javatests/src/org/chromium/net/test/util/TestWebServer.java
diff --git a/net/test/android/javatests/src/org/chromium/net/test/util/TestWebServer.java b/net/test/android/javatests/src/org/chromium/net/test/util/TestWebServer.java
index c698edbcf464d3132032c7f60d7dbb075b673c86..5815bc1eee207cfd15e3b254d11d5870ce5b2c5b 100644
--- a/net/test/android/javatests/src/org/chromium/net/test/util/TestWebServer.java
+++ b/net/test/android/javatests/src/org/chromium/net/test/util/TestWebServer.java
@@ -73,6 +73,7 @@ public class TestWebServer {
private String mServerUri;
private final boolean mSsl;
private final int mPort;
+ private long mResponseDelay; // Number of milliseconds to wait before answering a request
private static class Response {
final byte[] mResponseData;
@@ -126,6 +127,7 @@ public class TestWebServer {
mServerThread = new ServerThread(this, mPort, mSsl);
mServerUri += "//localhost:" + mServerThread.mSocket.getLocalPort();
+ mResponseDelay = 0;
}
public static TestWebServer start(int port) throws Exception {
@@ -465,6 +467,10 @@ public class TestWebServer {
assert Thread.currentThread() == mServerThread
: "getResponse called from non-server thread";
+ if (mResponseDelay > 0) {
+ Thread.sleep(mResponseDelay);
+ }
+
RequestLine requestLine = request.getRequestLine();
HttpResponse httpResponse = null;
Log.i(TAG, requestLine.getMethod() + ": " + requestLine.getUri());
@@ -562,6 +568,10 @@ public class TestWebServer {
return entity;
}
+ public void setResponseDelay(long responseDelay) {
+ mResponseDelay = responseDelay;
+ }
+
private static class ServerThread extends Thread {
private TestWebServer mServer;
private ServerSocket mSocket;

Powered by Google App Engine
This is Rietveld 408576698