Update base/android to use new ScopedJava(Global)Reference

base/android/path_utils.cc

Index: base/android/path_utils.cc
diff --git a/base/android/path_utils.cc b/base/android/path_utils.cc
index b3065d57bf981294fc45ea1b5c6900681d58b639..623e030cb10dc3361df02fab1027f72f87bf4926 100644
--- a/base/android/path_utils.cc
+++ b/base/android/path_utils.cc
@@ -4,9 +4,9 @@
 
 #include "base/android/path_utils.h"
 
-#include "base/android/auto_jobject.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
+#include "base/android/scoped_java_reference.h"
 
 #include "jni/path_utils_jni.h"
 
@@ -15,20 +15,16 @@ namespace android {
 
 std::string GetDataDirectory() {
   JNIEnv* env = AttachCurrentThread();
-  AutoJObject path = AutoJObject::FromLocalRef(
-      env, Java_PathUtils_getDataDirectory(
-          env, base::android::GetApplicationContext()));
-  return base::android::ConvertJavaStringToUTF8(
-      env, static_cast<jstring>(path.obj()));
+  ScopedJavaReference<jstring> path(env, Java_PathUtils_getDataDirectory(
+      env, base::android::GetApplicationContext()));
+  return base::android::ConvertJavaStringToUTF8(env, path.obj());
 }
 
 std::string GetCacheDirectory() {
   JNIEnv* env = AttachCurrentThread();
-  AutoJObject path = AutoJObject::FromLocalRef(
-      env, Java_PathUtils_getCacheDirectory(
-          env, base::android::GetApplicationContext()));
-  return base::android::ConvertJavaStringToUTF8(
-      env, static_cast<jstring>(path.obj()));
+  ScopedJavaReference<jstring> path(env, Java_PathUtils_getCacheDirectory(
+      env, base::android::GetApplicationContext()));
+  return base::android::ConvertJavaStringToUTF8(env, path.obj());
 }
 
 bool RegisterPathUtils(JNIEnv* env) {