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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <jni.h>
6
5 #include "base/android/base_jni_registrar.h" 7 #include "base/android/base_jni_registrar.h"
6 #include "base/android/jni_android.h" 8 #include "base/android/jni_android.h"
7 #include "base/android/jni_registrar.h" 9 #include "base/android/jni_registrar.h"
8 #include "base/at_exit.h" 10 #include "base/at_exit.h"
9 #include "components/cronet/android/chromium_url_request.h" 11 #include "components/cronet/android/chromium_url_request.h"
10 #include "components/cronet/android/chromium_url_request_context.h" 12 #include "components/cronet/android/chromium_url_request_context.h"
13 #include "components/cronet/android/test/mock_url_request_job.h"
11 #include "net/android/net_jni_registrar.h" 14 #include "net/android/net_jni_registrar.h"
12 #include "url/android/url_jni_registrar.h" 15 #include "url/android/url_jni_registrar.h"
13 16
14 #if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID) 17 #if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
15 #include "base/i18n/icu_util.h" 18 #include "base/i18n/icu_util.h"
16 #endif 19 #endif
17 20
18 namespace { 21 namespace {
19 22
23
mmenke 2014/09/03 18:02:34 nit: Remove extra newline.
20 const base::android::RegistrationMethod kCronetRegisteredMethods[] = { 24 const base::android::RegistrationMethod kCronetRegisteredMethods[] = {
21 {"BaseAndroid", base::android::RegisterJni}, 25 {"BaseAndroid", base::android::RegisterJni},
22 {"ChromiumUrlRequest", cronet::ChromiumUrlRequestRegisterJni}, 26 {"ChromiumUrlRequest", cronet::ChromiumUrlRequestRegisterJni},
23 {"ChromiumUrlRequestContext", cronet::ChromiumUrlRequestContextRegisterJni}, 27 {"ChromiumUrlRequestContext", cronet::ChromiumUrlRequestContextRegisterJni},
24 {"NetAndroid", net::android::RegisterJni}, 28 {"NetAndroid", net::android::RegisterJni},
25 {"UrlAndroid", url::android::RegisterJni}, 29 {"UrlAndroid", url::android::RegisterJni},
30 {"MockURLRequestJobTest", cronet::MockURLRequestJobRegisterJni},
26 }; 31 };
27 32
28 base::AtExitManager* g_at_exit_manager = NULL; 33 base::AtExitManager* g_at_exit_manager = NULL;
29 34
30 } // namespace 35 } // namespace
31 36
37 // This is called by the VM when the shared library is first loaded.
32 // Checks the available version of JNI. Also, caches Java reflection artifacts. 38 // Checks the available version of JNI. Also, caches Java reflection artifacts.
33 extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved) { 39 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
34 JNIEnv* env; 40 JNIEnv* env;
35 if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) { 41 if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
36 return -1; 42 return -1;
37 } 43 }
38 44
39 base::android::InitVM(vm); 45 base::android::InitVM(vm);
40 46
41 if (!base::android::RegisterNativeMethods( 47 if (!base::android::RegisterNativeMethods(
42 env, kCronetRegisteredMethods, arraysize(kCronetRegisteredMethods))) { 48 env, kCronetRegisteredMethods, arraysize(kCronetRegisteredMethods))) {
43 return -1; 49 return -1;
44 } 50 }
45 51
46 g_at_exit_manager = new base::AtExitManager(); 52 g_at_exit_manager = new base::AtExitManager();
47 53
48 #if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID) 54 #if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
49 base::i18n::InitializeICU(); 55 base::i18n::InitializeICU();
50 #endif 56 #endif
51 57
52 return JNI_VERSION_1_6; 58 return JNI_VERSION_1_6;
53 } 59 }
54 60
55 extern "C" void JNIEXPORT JNICALL JNI_OnUnLoad(JavaVM* jvm, void* reserved) { 61 JNI_EXPORT void JNIEXPORT JNICALL JNI_OnUnLoad(JavaVM* jvm, void* reserved) {
56 if (g_at_exit_manager) { 62 if (g_at_exit_manager) {
57 delete g_at_exit_manager; 63 delete g_at_exit_manager;
58 g_at_exit_manager = NULL; 64 g_at_exit_manager = NULL;
59 } 65 }
60 } 66 }
61 67
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698