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

Side by Side Diff: components/cronet/android/cronet_jni.cc

Issue 536023003: Fix crash in Cronet CreateUrlRequestAdapter. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 "base/android/base_jni_registrar.h" 5 #include "base/android/base_jni_registrar.h"
6 #include "base/android/jni_android.h" 6 #include "base/android/jni_android.h"
7 #include "base/android/jni_registrar.h" 7 #include "base/android/jni_registrar.h"
8 #include "base/at_exit.h" 8 #include "base/at_exit.h"
9 #include "components/cronet/android/chromium_url_request.h" 9 #include "components/cronet/android/chromium_url_request.h"
10 #include "components/cronet/android/chromium_url_request_context.h" 10 #include "components/cronet/android/chromium_url_request_context.h"
11 #include "net/android/net_jni_registrar.h" 11 #include "net/android/net_jni_registrar.h"
12 #include "url/android/url_jni_registrar.h" 12 #include "url/android/url_jni_registrar.h"
13 #include "url/url_util.h"
13 14
14 #if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID) 15 #if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
15 #include "base/i18n/icu_util.h" 16 #include "base/i18n/icu_util.h"
16 #endif 17 #endif
17 18
18 namespace { 19 namespace {
19 20
20 const base::android::RegistrationMethod kCronetRegisteredMethods[] = { 21 const base::android::RegistrationMethod kCronetRegisteredMethods[] = {
21 {"BaseAndroid", base::android::RegisterJni}, 22 {"BaseAndroid", base::android::RegisterJni},
22 {"ChromiumUrlRequest", cronet::ChromiumUrlRequestRegisterJni}, 23 {"ChromiumUrlRequest", cronet::ChromiumUrlRequestRegisterJni},
(...skipping 19 matching lines...) Expand all
42 env, kCronetRegisteredMethods, arraysize(kCronetRegisteredMethods))) { 43 env, kCronetRegisteredMethods, arraysize(kCronetRegisteredMethods))) {
43 return -1; 44 return -1;
44 } 45 }
45 46
46 g_at_exit_manager = new base::AtExitManager(); 47 g_at_exit_manager = new base::AtExitManager();
47 48
48 #if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID) 49 #if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
49 base::i18n::InitializeICU(); 50 base::i18n::InitializeICU();
50 #endif 51 #endif
51 52
53 url::Initialize();
54
52 return JNI_VERSION_1_6; 55 return JNI_VERSION_1_6;
53 } 56 }
54 57
55 extern "C" void JNIEXPORT JNICALL JNI_OnUnLoad(JavaVM* jvm, void* reserved) { 58 extern "C" void JNIEXPORT JNICALL JNI_OnUnLoad(JavaVM* jvm, void* reserved) {
56 if (g_at_exit_manager) { 59 if (g_at_exit_manager) {
57 delete g_at_exit_manager; 60 delete g_at_exit_manager;
58 g_at_exit_manager = NULL; 61 g_at_exit_manager = NULL;
59 } 62 }
63 url::Shutdown();
Charles 2014/09/03 18:28:20 I don't think this actually ever gets called. http
mef 2014/09/03 18:32:38 Yeah, but if it ever does we will do the right thi
mmenke 2014/09/03 18:43:06 Is this the right thing? Can we be guaranteed tha
mef 2014/09/03 18:56:04 Done.
60 } 64 }
61 65
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698