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

Unified Diff: net/test/embedded_test_server/android/embedded_test_server_android.h

Issue 1174613002: [Android] Add a Java version of net::test_server::EmbeddedTestServer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: now with compilation 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/embedded_test_server/android/embedded_test_server_android.h
diff --git a/net/test/embedded_test_server/android/embedded_test_server_android.h b/net/test/embedded_test_server/android/embedded_test_server_android.h
new file mode 100644
index 0000000000000000000000000000000000000000..f324162152b80851cd8dc4c80f92a19cfcf865a6
--- /dev/null
+++ b/net/test/embedded_test_server/android/embedded_test_server_android.h
@@ -0,0 +1,54 @@
+#ifndef NET_TEST_EMBEDDED_TEST_SERVER_ANDROID_EMBEDDED_TEST_SERVER_ANDROID_H_
mef 2015/06/17 21:55:56 need copyright comment
jbudorick 2015/06/18 17:44:56 done
+#define NET_TEST_EMBEDDED_TEST_SERVER_ANDROID_EMBEDDED_TEST_SERVER_ANDROID_H_
+
+#include <jni.h>
+
+#include "base/android/jni_weak_ref.h"
+#include "base/android/scoped_java_ref.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
+#include "net/test/embedded_test_server/http_request.h"
+#include "net/test/embedded_test_server/http_response.h"
+
+namespace net {
+namespace test_server {
+
+// The C++ side of the Java EmbeddedTestServer.
+class EmbeddedTestServerAndroid {
+ public:
+ EmbeddedTestServerAndroid(JNIEnv* env, jobject obj);
+ ~EmbeddedTestServerAndroid();
+
+ void Destroy(JNIEnv* env, jobject obj);
+
+ jboolean InitializeAndWaitUntilReady(JNIEnv* env, jobject obj);
+
+ jboolean ShutdownAndWaitUntilComplete(JNIEnv* env, jobject obj);
+
+ base::android::ScopedJavaLocalRef<jstring> GetURL(JNIEnv* env,
+ jobject obj,
+ jstring relative_url) const;
mef 2015/06/17 21:55:56 I'm not sure whether this is recommended or requir
jbudorick 2015/06/18 17:44:56 I've seen both, but I'm happy to do it in net/ if
+
+ void ServeFilesFromDirectory(JNIEnv* env,
+ jobject obj,
+ jstring directory_path);
+
+ void RegisterRequestHandler(JNIEnv* env, jobject obj, jlong request_handler);
mef 2015/06/17 21:55:56 How will request_handlers be created?
jbudorick 2015/06/18 17:44:56 As you noted in the java file, these are unused in
+
+ void RegisterRequestHandlers(JNIEnv* env,
+ jobject obj,
+ jlongArray request_handlers);
+
+ static bool RegisterEmbeddedTestServerAndroid(JNIEnv* env);
+
+ private:
+ JavaObjectWeakGlobalRef weak_java_server_;
+
+ EmbeddedTestServer test_server_;
+
+ DISALLOW_COPY_AND_ASSIGN(EmbeddedTestServerAndroid);
+};
+
+} // namespace test_server
+} // namespace net
+
+#endif // NET_TEST_EMBEDDED_TEST_SERVER_ANDROID_EMBEDDED_TEST_SERVER_ANDROID_H_

Powered by Google App Engine
This is Rietveld 408576698