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

Unified Diff: net/android/network_library.cc

Issue 2828353002: Android: Remove GetApplicationContext part 3 (Closed)
Patch Set: Fix android webview tests Created 3 years, 8 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
« no previous file with comments | « net/android/network_change_notifier_delegate_android.cc ('k') | net/cert/x509_util_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/android/network_library.cc
diff --git a/net/android/network_library.cc b/net/android/network_library.cc
index 753595262810d3137f42048fa6f1ac43d2ce01a8..48f3a9582311a6b6427db61a65634a681744b731 100644
--- a/net/android/network_library.cc
+++ b/net/android/network_library.cc
@@ -4,7 +4,6 @@
#include "net/android/network_library.h"
-#include "base/android/context_utils.h"
#include "base/android/jni_android.h"
#include "base/android/jni_array.h"
#include "base/android/jni_string.h"
@@ -16,7 +15,6 @@
using base::android::AttachCurrentThread;
using base::android::ConvertJavaStringToUTF8;
using base::android::ConvertUTF8ToJavaString;
-using base::android::GetApplicationContext;
using base::android::ScopedJavaLocalRef;
using base::android::ToJavaArrayOfByteArray;
using base::android::ToJavaByteArray;
@@ -73,8 +71,8 @@ bool StoreKeyPair(const uint8_t* public_key,
ToJavaByteArray(env, public_key, public_len);
ScopedJavaLocalRef<jbyteArray> private_array =
ToJavaByteArray(env, private_key, private_len);
- jboolean ret = Java_AndroidNetworkLibrary_storeKeyPair(
- env, GetApplicationContext(), public_array, private_array);
+ jboolean ret =
+ Java_AndroidNetworkLibrary_storeKeyPair(env, public_array, private_array);
LOG_IF(WARNING, !ret) <<
"Call to Java_AndroidNetworkLibrary_storeKeyPair failed";
return ret;
@@ -110,50 +108,42 @@ bool GetMimeTypeFromExtension(const std::string& extension,
std::string GetTelephonyNetworkCountryIso() {
return base::android::ConvertJavaStringToUTF8(
Java_AndroidNetworkLibrary_getNetworkCountryIso(
- base::android::AttachCurrentThread(),
- base::android::GetApplicationContext()));
+ base::android::AttachCurrentThread()));
}
std::string GetTelephonyNetworkOperator() {
return base::android::ConvertJavaStringToUTF8(
Java_AndroidNetworkLibrary_getNetworkOperator(
- base::android::AttachCurrentThread(),
- base::android::GetApplicationContext()));
+ base::android::AttachCurrentThread()));
}
std::string GetTelephonySimOperator() {
return base::android::ConvertJavaStringToUTF8(
Java_AndroidNetworkLibrary_getSimOperator(
- base::android::AttachCurrentThread(),
- base::android::GetApplicationContext()));
+ base::android::AttachCurrentThread()));
}
bool GetIsRoaming() {
return Java_AndroidNetworkLibrary_getIsRoaming(
- base::android::AttachCurrentThread(),
- base::android::GetApplicationContext());
+ base::android::AttachCurrentThread());
}
bool GetIsCaptivePortal() {
return Java_AndroidNetworkLibrary_getIsCaptivePortal(
- base::android::AttachCurrentThread(),
- base::android::GetApplicationContext());
+ base::android::AttachCurrentThread());
}
std::string GetWifiSSID() {
return base::android::ConvertJavaStringToUTF8(
Java_AndroidNetworkLibrary_getWifiSSID(
- base::android::AttachCurrentThread(),
- base::android::GetApplicationContext()));
+ base::android::AttachCurrentThread()));
}
void GetDnsServers(std::vector<IPEndPoint>* dns_servers) {
JNIEnv* env = AttachCurrentThread();
std::vector<std::string> dns_servers_strings;
base::android::JavaArrayOfByteArrayToStringVector(
- env, Java_AndroidNetworkLibrary_getDnsServers(
- env, base::android::GetApplicationContext())
- .obj(),
+ env, Java_AndroidNetworkLibrary_getDnsServers(env).obj(),
&dns_servers_strings);
for (const std::string& dns_address_string : dns_servers_strings) {
IPAddress dns_address(
« no previous file with comments | « net/android/network_change_notifier_delegate_android.cc ('k') | net/cert/x509_util_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698