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

Unified Diff: components/cronet/android/test/cronet_tests_jni.cc

Issue 525613002: Set up initial MockURLRequestJob tests for Cronet (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments Created 6 years, 3 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: components/cronet/android/test/cronet_tests_jni.cc
diff --git a/components/cronet/android/cronet_jni.cc b/components/cronet/android/test/cronet_tests_jni.cc
similarity index 83%
copy from components/cronet/android/cronet_jni.cc
copy to components/cronet/android/test/cronet_tests_jni.cc
index 890649a183a7496a9673f8c2ed3471d4de543d10..20924973cae91460e218fbb3eefc20ba440de614 100644
--- a/components/cronet/android/cronet_jni.cc
+++ b/components/cronet/android/test/cronet_tests_jni.cc
@@ -2,12 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <jni.h>
+
#include "base/android/base_jni_registrar.h"
#include "base/android/jni_android.h"
#include "base/android/jni_registrar.h"
#include "base/at_exit.h"
#include "components/cronet/android/chromium_url_request.h"
#include "components/cronet/android/chromium_url_request_context.h"
+#include "components/cronet/android/test/mock_url_request_job.h"
#include "net/android/net_jni_registrar.h"
#include "url/android/url_jni_registrar.h"
@@ -17,20 +20,23 @@
namespace {
+
mmenke 2014/09/03 18:02:34 nit: Remove extra newline.
const base::android::RegistrationMethod kCronetRegisteredMethods[] = {
{"BaseAndroid", base::android::RegisterJni},
{"ChromiumUrlRequest", cronet::ChromiumUrlRequestRegisterJni},
{"ChromiumUrlRequestContext", cronet::ChromiumUrlRequestContextRegisterJni},
{"NetAndroid", net::android::RegisterJni},
{"UrlAndroid", url::android::RegisterJni},
+ {"MockURLRequestJobTest", cronet::MockURLRequestJobRegisterJni},
};
base::AtExitManager* g_at_exit_manager = NULL;
} // namespace
+// This is called by the VM when the shared library is first loaded.
// Checks the available version of JNI. Also, caches Java reflection artifacts.
-extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved) {
+JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
mmenke 2014/09/03 18:02:34 This duplicates a lot of code. We should make pub
JNIEnv* env;
if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
return -1;
@@ -52,7 +58,7 @@ extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved) {
return JNI_VERSION_1_6;
}
-extern "C" void JNIEXPORT JNICALL JNI_OnUnLoad(JavaVM* jvm, void* reserved) {
+JNI_EXPORT void JNIEXPORT JNICALL JNI_OnUnLoad(JavaVM* jvm, void* reserved) {
if (g_at_exit_manager) {
delete g_at_exit_manager;
g_at_exit_manager = NULL;

Powered by Google App Engine
This is Rietveld 408576698