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

Side by Side Diff: base/test/test_file_util_android.cc

Issue 444163003: Move the rest of test_file_util to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "jni/ContentUriTestUtils_jni.h" 10 #include "jni/ContentUriTestUtils_jni.h"
11 11
12 namespace file_util { 12 namespace base {
13 13
14 bool RegisterContentUriTestUtils(JNIEnv* env) { 14 bool RegisterContentUriTestUtils(JNIEnv* env) {
15 return RegisterNativesImpl(env); 15 return RegisterNativesImpl(env);
16 } 16 }
17 17
18 base::FilePath InsertImageIntoMediaStore(const base::FilePath& path) { 18 FilePath InsertImageIntoMediaStore(const FilePath& path) {
19 JNIEnv* env = base::android::AttachCurrentThread(); 19 JNIEnv* env = base::android::AttachCurrentThread();
20 ScopedJavaLocalRef<jstring> j_path = 20 ScopedJavaLocalRef<jstring> j_path =
21 base::android::ConvertUTF8ToJavaString(env, path.value()); 21 base::android::ConvertUTF8ToJavaString(env, path.value());
22 ScopedJavaLocalRef<jstring> j_uri = 22 ScopedJavaLocalRef<jstring> j_uri =
23 Java_ContentUriTestUtils_insertImageIntoMediaStore( 23 Java_ContentUriTestUtils_insertImageIntoMediaStore(
24 env, base::android::GetApplicationContext(), j_path.obj()); 24 env, base::android::GetApplicationContext(), j_path.obj());
25 std::string uri = base::android::ConvertJavaStringToUTF8(j_uri); 25 std::string uri = base::android::ConvertJavaStringToUTF8(j_uri);
26 return base::FilePath(uri); 26 return FilePath(uri);
27 } 27 }
28 28
29 } // namespace file_util 29 } // namespace file_util
rvargas (doing something else) 2014/08/06 23:21:49 base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698