| Index: components/variations/android/variations_seed_bridge.cc
|
| diff --git a/components/variations/android/variations_seed_bridge.cc b/components/variations/android/variations_seed_bridge.cc
|
| index f5b73e9a2ecd008652970d58c1831d95bb606a49..6b7bd84baab02a3589516b0ac63ecc4c711b07d5 100644
|
| --- a/components/variations/android/variations_seed_bridge.cc
|
| +++ b/components/variations/android/variations_seed_bridge.cc
|
| @@ -8,7 +8,6 @@
|
| #include <stdint.h>
|
| #include <vector>
|
|
|
| -#include "base/android/context_utils.h"
|
| #include "base/android/jni_android.h"
|
| #include "base/android/jni_array.h"
|
| #include "base/android/jni_string.h"
|
| @@ -18,7 +17,6 @@
|
| using base::android::AttachCurrentThread;
|
| using base::android::ConvertJavaStringToUTF8;
|
| using base::android::ConvertUTF8ToJavaString;
|
| -using base::android::GetApplicationContext;
|
| using base::android::ScopedJavaLocalRef;
|
|
|
| namespace {
|
| @@ -50,20 +48,15 @@ void GetVariationsFirstRunSeed(std::string* seed_data,
|
| bool* is_gzip_compressed) {
|
| JNIEnv* env = AttachCurrentThread();
|
| ScopedJavaLocalRef<jbyteArray> j_seed_data =
|
| - Java_VariationsSeedBridge_getVariationsFirstRunSeedData(
|
| - env, GetApplicationContext());
|
| + Java_VariationsSeedBridge_getVariationsFirstRunSeedData(env);
|
| ScopedJavaLocalRef<jstring> j_seed_signature =
|
| - Java_VariationsSeedBridge_getVariationsFirstRunSeedSignature(
|
| - env, GetApplicationContext());
|
| + Java_VariationsSeedBridge_getVariationsFirstRunSeedSignature(env);
|
| ScopedJavaLocalRef<jstring> j_seed_country =
|
| - Java_VariationsSeedBridge_getVariationsFirstRunSeedCountry(
|
| - env, GetApplicationContext());
|
| + Java_VariationsSeedBridge_getVariationsFirstRunSeedCountry(env);
|
| ScopedJavaLocalRef<jstring> j_response_date =
|
| - Java_VariationsSeedBridge_getVariationsFirstRunSeedDate(
|
| - env, GetApplicationContext());
|
| + Java_VariationsSeedBridge_getVariationsFirstRunSeedDate(env);
|
| jboolean j_is_gzip_compressed =
|
| - Java_VariationsSeedBridge_getVariationsFirstRunSeedIsGzipCompressed(
|
| - env, GetApplicationContext());
|
| + Java_VariationsSeedBridge_getVariationsFirstRunSeedIsGzipCompressed(env);
|
| *seed_data = JavaByteArrayToString(env, j_seed_data.obj());
|
| *seed_signature = ConvertJavaStringToUTF8(j_seed_signature);
|
| *seed_country = ConvertJavaStringToUTF8(j_seed_country);
|
| @@ -73,13 +66,12 @@ void GetVariationsFirstRunSeed(std::string* seed_data,
|
|
|
| void ClearJavaFirstRunPrefs() {
|
| JNIEnv* env = AttachCurrentThread();
|
| - Java_VariationsSeedBridge_clearFirstRunPrefs(env, GetApplicationContext());
|
| + Java_VariationsSeedBridge_clearFirstRunPrefs(env);
|
| }
|
|
|
| void MarkVariationsSeedAsStored() {
|
| JNIEnv* env = AttachCurrentThread();
|
| - Java_VariationsSeedBridge_markVariationsSeedAsStored(env,
|
| - GetApplicationContext());
|
| + Java_VariationsSeedBridge_markVariationsSeedAsStored(env);
|
| }
|
|
|
| void SetJavaFirstRunPrefsForTesting(const std::string& seed_data,
|
| @@ -89,7 +81,7 @@ void SetJavaFirstRunPrefsForTesting(const std::string& seed_data,
|
| bool is_gzip_compressed) {
|
| JNIEnv* env = AttachCurrentThread();
|
| Java_VariationsSeedBridge_setVariationsFirstRunSeed(
|
| - env, GetApplicationContext(), StringToJavaByteArray(env, seed_data),
|
| + env, StringToJavaByteArray(env, seed_data),
|
| ConvertUTF8ToJavaString(env, seed_signature),
|
| ConvertUTF8ToJavaString(env, seed_country),
|
| ConvertUTF8ToJavaString(env, response_date),
|
|
|