diff options
| author | nyquist@google.com <nyquist@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-22 21:52:44 +0000 |
|---|---|---|
| committer | nyquist@google.com <nyquist@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-22 21:52:44 +0000 |
| commit | 982cedd4272743bce74fd3a7ea58c82924a8b7cb (patch) | |
| tree | a0cb4d895e3185b87f9aab410de70b022eed3130 /net/android | |
| parent | c9c33c66c4c17ec027f86d895d7528a478fd82d6 (diff) | |
| download | chromium_src-982cedd4272743bce74fd3a7ea58c82924a8b7cb.zip chromium_src-982cedd4272743bce74fd3a7ea58c82924a8b7cb.tar.gz chromium_src-982cedd4272743bce74fd3a7ea58c82924a8b7cb.tar.bz2 | |
[net] Move android/x509_util.[cc|h] to cert/x509_util_android.[cc|h]
Another x509_util.[cc|h] already exist, and the Android specific files
where introduced in r230126.
BUG=149426
R=rsleevi@chromium.org
Review URL: https://codereview.chromium.org/35763004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230218 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/android')
| -rw-r--r-- | net/android/net_jni_registrar.cc | 2 | ||||
| -rw-r--r-- | net/android/x509_util.cc | 25 | ||||
| -rw-r--r-- | net/android/x509_util.h | 16 |
3 files changed, 1 insertions, 42 deletions
diff --git a/net/android/net_jni_registrar.cc b/net/android/net_jni_registrar.cc index ab99725..f7712bb 100644 --- a/net/android/net_jni_registrar.cc +++ b/net/android/net_jni_registrar.cc @@ -11,7 +11,7 @@ #include "net/android/keystore.h" #include "net/android/network_change_notifier_android.h" #include "net/android/network_library.h" -#include "net/android/x509_util.h" +#include "net/cert/x509_util_android.h" #include "net/proxy/proxy_config_service_android.h" namespace net { diff --git a/net/android/x509_util.cc b/net/android/x509_util.cc deleted file mode 100644 index 9f3491f..0000000 --- a/net/android/x509_util.cc +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "net/android/x509_util.h" - -#include "base/android/jni_android.h" -#include "jni/X509Util_jni.h" -#include "net/cert/cert_database.h" - -namespace net { - -void NotifyKeyChainChanged(JNIEnv* env, jclass clazz) { - CertDatabase::GetInstance()->OnAndroidKeyChainChanged(); -} - -jobject GetApplicationContext(JNIEnv* env, jclass clazz) { - return base::android::GetApplicationContext(); -} - -bool RegisterX509Util(JNIEnv* env) { - return RegisterNativesImpl(env); -} - -} // net namespace diff --git a/net/android/x509_util.h b/net/android/x509_util.h deleted file mode 100644 index 963dd23..0000000 --- a/net/android/x509_util.h +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef NET_ANDROID_X509_UTIL_H_ -#define NET_ANDROID_X509_UTIL_H_ - -#include <jni.h> - -namespace net { - -bool RegisterX509Util(JNIEnv* env); - -} // net namespace - -#endif // NET_ANDROID_X509_UTIL_H_ |