| Index: chrome/browser/android/preferences/pref_service_bridge.cc
|
| diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/browser/android/preferences/pref_service_bridge.cc
|
| index 96e721bdda7fde46300100eb1f577034deef3fab..5b5f4b54ac3b2e812c18acfc28a2a45e8f9c3d3a 100644
|
| --- a/chrome/browser/android/preferences/pref_service_bridge.cc
|
| +++ b/chrome/browser/android/preferences/pref_service_bridge.cc
|
| @@ -5,16 +5,13 @@
|
| #include "chrome/browser/android/preferences/pref_service_bridge.h"
|
|
|
| #include <jni.h>
|
| -#include <vector>
|
|
|
| #include "base/android/build_info.h"
|
| #include "base/android/jni_android.h"
|
| -#include "base/android/jni_array.h"
|
| #include "base/android/jni_string.h"
|
| #include "base/android/jni_weak_ref.h"
|
| #include "base/files/file_path.h"
|
| #include "base/files/file_util.h"
|
| -#include "base/logging.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/prefs/pref_service.h"
|
| #include "base/strings/string_util.h"
|
| @@ -39,7 +36,6 @@
|
| #include "components/signin/core/common/signin_pref_names.h"
|
| #include "components/translate/core/browser/translate_prefs.h"
|
| #include "components/translate/core/common/translate_pref_names.h"
|
| -#include "components/variations/pref_names.h"
|
| #include "components/version_info/version_info.h"
|
| #include "components/web_resource/web_resource_pref_names.h"
|
| #include "content/public/browser/browser_thread.h"
|
| @@ -51,7 +47,6 @@ using base::android::AttachCurrentThread;
|
| using base::android::CheckException;
|
| using base::android::ConvertJavaStringToUTF8;
|
| using base::android::ConvertUTF8ToJavaString;
|
| -using base::android::GetApplicationContext;
|
| using base::android::ScopedJavaLocalRef;
|
| using base::android::ScopedJavaGlobalRef;
|
| using content::BrowserThread;
|
| @@ -116,14 +111,6 @@ PrefService* GetPrefService() {
|
| return GetOriginalProfile()->GetPrefs();
|
| }
|
|
|
| -std::string JavaByteArrayToString(JNIEnv* env, jbyteArray byte_array) {
|
| - if (!byte_array)
|
| - return std::string();
|
| - std::vector<uint8> array_data;
|
| - base::android::JavaByteArrayToByteVector(env, byte_array, &array_data);
|
| - return std::string(array_data.begin(), array_data.end());
|
| -}
|
| -
|
| } // namespace
|
|
|
| // ----------------------------------------------------------------------------
|
| @@ -961,22 +948,3 @@ std::string PrefServiceBridge::GetAndroidPermissionForContentSetting(
|
|
|
| return ConvertJavaStringToUTF8(android_permission);
|
| }
|
| -
|
| -// static
|
| -void PrefServiceBridge::GetVariationsFirstRunSeed(std::string* seed_data,
|
| - std::string* seed_signature,
|
| - std::string* seed_country) {
|
| - JNIEnv* env = AttachCurrentThread();
|
| - ScopedJavaLocalRef<jbyteArray> j_seed_data =
|
| - Java_PrefServiceBridge_getVariationsFirstRunSeedData(
|
| - env, GetApplicationContext());
|
| - ScopedJavaLocalRef<jstring> j_seed_signature =
|
| - Java_PrefServiceBridge_getVariationsFirstRunSeedSignature(
|
| - env, GetApplicationContext());
|
| - ScopedJavaLocalRef<jstring> j_seed_country =
|
| - Java_PrefServiceBridge_getVariationsFirstRunSeedCountry(
|
| - env, GetApplicationContext());
|
| - *seed_data = JavaByteArrayToString(env, j_seed_data.obj());
|
| - *seed_signature = ConvertJavaStringToUTF8(j_seed_signature);
|
| - *seed_country = ConvertJavaStringToUTF8(j_seed_country);
|
| -}
|
|
|