| OLD | NEW | 
|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "base/test/test_file_util.h" | 5 #include "base/test/test_file_util.h" | 
| 6 | 6 | 
|  | 7 #include "base/android/context_utils.h" | 
| 7 #include "base/android/jni_android.h" | 8 #include "base/android/jni_android.h" | 
| 8 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" | 
| 9 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" | 
| 10 #include "jni/ContentUriTestUtils_jni.h" | 11 #include "jni/ContentUriTestUtils_jni.h" | 
| 11 | 12 | 
| 12 namespace base { | 13 namespace base { | 
| 13 | 14 | 
| 14 bool RegisterContentUriTestUtils(JNIEnv* env) { | 15 bool RegisterContentUriTestUtils(JNIEnv* env) { | 
| 15   return RegisterNativesImpl(env); | 16   return RegisterNativesImpl(env); | 
| 16 } | 17 } | 
| 17 | 18 | 
| 18 FilePath InsertImageIntoMediaStore(const FilePath& path) { | 19 FilePath InsertImageIntoMediaStore(const FilePath& path) { | 
| 19   JNIEnv* env = base::android::AttachCurrentThread(); | 20   JNIEnv* env = base::android::AttachCurrentThread(); | 
| 20   ScopedJavaLocalRef<jstring> j_path = | 21   ScopedJavaLocalRef<jstring> j_path = | 
| 21       base::android::ConvertUTF8ToJavaString(env, path.value()); | 22       base::android::ConvertUTF8ToJavaString(env, path.value()); | 
| 22   ScopedJavaLocalRef<jstring> j_uri = | 23   ScopedJavaLocalRef<jstring> j_uri = | 
| 23       Java_ContentUriTestUtils_insertImageIntoMediaStore( | 24       Java_ContentUriTestUtils_insertImageIntoMediaStore( | 
| 24           env, base::android::GetApplicationContext(), j_path.obj()); | 25           env, base::android::GetApplicationContext(), j_path.obj()); | 
| 25   std::string uri = base::android::ConvertJavaStringToUTF8(j_uri); | 26   std::string uri = base::android::ConvertJavaStringToUTF8(j_uri); | 
| 26   return FilePath(uri); | 27   return FilePath(uri); | 
| 27 } | 28 } | 
| 28 | 29 | 
| 29 }  // namespace base | 30 }  // namespace base | 
| OLD | NEW | 
|---|