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

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

Issue 1378123003: Adding SSL ETS Tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ets
Patch Set: Rebase. Created 5 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
Index: net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java
diff --git a/net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java b/net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java
index 2eab2798a5357f3cf137a784d7ea5b3cb5be25ef..14ee4b3d5f177f262359e0d078a2941a36fcb805 100644
--- a/net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java
+++ b/net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java
@@ -16,7 +16,7 @@ import java.io.File;
* EmbeddedTestServer s = new EmbeddedTestServer();
* s.initializeNative();
* s.serveFilesFromDirectory("/path/to/my/directory");
- * if (!s.initializeAndWaitUntilReady()) {
+ * if (!s.start()) {
* throw new SomeKindOfException("Unable to initialize EmbeddedTestServer.");
* }
*
@@ -54,15 +54,25 @@ public class EmbeddedTestServer {
nativeServeFilesFromDirectory(mNativeEmbeddedTestServer, directoryPath);
}
- /** Initialize the server.
+ /** Wrapper for start()
+ *
+ * start() should be used instead of this.
+ *
+ * @return Whether the server was successfully initialized.
+ */
+ public boolean initializeAndWaitUntilReady() {
+ return start();
+ }
+
+ /** Starts the server.
*
* Note that this should be called after handlers are set up, including any relevant calls
* serveFilesFromDirectory.
*
* @return Whether the server was successfully initialized.
*/
- public boolean initializeAndWaitUntilReady() {
- return nativeInitializeAndWaitUntilReady(mNativeEmbeddedTestServer);
+ public boolean start() {
+ return nativeStart(mNativeEmbeddedTestServer);
}
/** Get the full URL for the given relative URL.
@@ -103,7 +113,7 @@ public class EmbeddedTestServer {
private native void nativeInit();
private native void nativeDestroy(long nativeEmbeddedTestServerAndroid);
- private native boolean nativeInitializeAndWaitUntilReady(long nativeEmbeddedTestServerAndroid);
+ private native boolean nativeStart(long nativeEmbeddedTestServerAndroid);
private native boolean nativeShutdownAndWaitUntilComplete(long nativeEmbeddedTestServerAndroid);
private native String nativeGetURL(long nativeEmbeddedTestServerAndroid, String relativeUrl);
private native void nativeServeFilesFromDirectory(
« no previous file with comments | « net/proxy/proxy_script_fetcher_impl_unittest.cc ('k') | net/test/embedded_test_server/android/embedded_test_server_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698