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

Side by Side Diff: net/android/net_jni_registrar.cc

Issue 1474603004: Remove Android support for out-of-process KeyStores (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updated comments Created 5 years 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
« no previous file with comments | « net/android/keystore_unittest.cc ('k') | net/net.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "net/android/net_jni_registrar.h" 5 #include "net/android/net_jni_registrar.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_registrar.h" 8 #include "base/android/jni_registrar.h"
9 #include "net/android/android_private_key.h"
10 #include "net/android/gurl_utils.h" 9 #include "net/android/gurl_utils.h"
11 #include "net/android/http_auth_negotiate_android.h" 10 #include "net/android/http_auth_negotiate_android.h"
12 #include "net/android/keystore.h" 11 #include "net/android/keystore.h"
13 #include "net/android/network_change_notifier_android.h" 12 #include "net/android/network_change_notifier_android.h"
14 #include "net/android/network_library.h" 13 #include "net/android/network_library.h"
15 #include "net/android/traffic_stats.h" 14 #include "net/android/traffic_stats.h"
16 #include "net/cert/x509_util_android.h" 15 #include "net/cert/x509_util_android.h"
17 #include "net/proxy/proxy_config_service_android.h" 16 #include "net/proxy/proxy_config_service_android.h"
18 17
19 #if defined(USE_ICU_ALTERNATIVES_ON_ANDROID) 18 #if defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
20 #include "net/base/net_string_util_icu_alternatives_android.h" 19 #include "net/base/net_string_util_icu_alternatives_android.h"
21 #endif 20 #endif
22 21
23 namespace net { 22 namespace net {
24 namespace android { 23 namespace android {
25 24
26 static base::android::RegistrationMethod kNetRegisteredMethods[] = { 25 static base::android::RegistrationMethod kNetRegisteredMethods[] = {
27 {"AndroidCertVerifyResult", RegisterCertVerifyResult}, 26 {"AndroidCertVerifyResult", RegisterCertVerifyResult},
28 {"AndroidPrivateKey", RegisterAndroidPrivateKey},
29 {"AndroidKeyStore", RegisterKeyStore}, 27 {"AndroidKeyStore", RegisterKeyStore},
30 {"AndroidNetworkLibrary", RegisterNetworkLibrary}, 28 {"AndroidNetworkLibrary", RegisterNetworkLibrary},
31 {"AndroidTrafficStats", traffic_stats::Register}, 29 {"AndroidTrafficStats", traffic_stats::Register},
32 {"GURLUtils", RegisterGURLUtils}, 30 {"GURLUtils", RegisterGURLUtils},
33 {"HttpAuthNegotiateAndroid", HttpAuthNegotiateAndroid::Register}, 31 {"HttpAuthNegotiateAndroid", HttpAuthNegotiateAndroid::Register},
34 {"NetworkChangeNotifierAndroid", NetworkChangeNotifierAndroid::Register}, 32 {"NetworkChangeNotifierAndroid", NetworkChangeNotifierAndroid::Register},
35 {"ProxyConfigService", ProxyConfigServiceAndroid::Register}, 33 {"ProxyConfigService", ProxyConfigServiceAndroid::Register},
36 {"X509Util", RegisterX509Util}, 34 {"X509Util", RegisterX509Util},
37 #if defined(USE_ICU_ALTERNATIVES_ON_ANDROID) 35 #if defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
38 {"NetStringUtils", RegisterNetStringUtils} 36 {"NetStringUtils", RegisterNetStringUtils}
39 #endif 37 #endif
40 }; 38 };
41 39
42 bool RegisterJni(JNIEnv* env) { 40 bool RegisterJni(JNIEnv* env) {
43 return base::android::RegisterNativeMethods( 41 return base::android::RegisterNativeMethods(
44 env, kNetRegisteredMethods, arraysize(kNetRegisteredMethods)); 42 env, kNetRegisteredMethods, arraysize(kNetRegisteredMethods));
45 } 43 }
46 44
47 } // namespace android 45 } // namespace android
48 } // namespace net 46 } // namespace net
OLDNEW
« no previous file with comments | « net/android/keystore_unittest.cc ('k') | net/net.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698