Upstreaming chrome/common/chrome_* diff.

base/android/path_utils.h

Index: base/android/path_utils.h
diff --git a/base/android/path_utils.h b/base/android/path_utils.h
index 29c94d6bad1859726895619f529e641e3181315d..37349d36155fb88f9780413b04a4f74dba55d11d 100644
--- a/base/android/path_utils.h
+++ b/base/android/path_utils.h
@@ -6,30 +6,36 @@
 #define BASE_ANDROID_PATH_UTILS_H_
 
 #include <jni.h>
-#include <string>
+
+class FilePath;
 
 namespace base {
 namespace android {
 
-// Return the absolute path to the data directory of the current application.
+// Retrieves the absolute path to the data directory of the current
+// application. The result is placed in the FilePath pointed to by 'result'.
 // This method is dedicated for base_paths_android.c, Using
 // PathService::Get(base::DIR_ANDROID_APP_DATA, ...) gets the data dir.
-std::string GetDataDirectory();
+bool GetDataDirectory(FilePath* result);
 
-// Return the absolute path to the cache directory. This method is dedicated for
+// Retrieves the absolute path to the cache directory. The result is placed in
+// the FilePath pointed to by 'result'. This method is dedicated for
 // base_paths_android.c, Using PathService::Get(base::DIR_CACHE, ...) gets the
 // cache dir.
-std::string GetCacheDirectory();
+bool GetCacheDirectory(FilePath* result);
 
-// Returns the path to the public downloads directory.
-std::string GetDownloadsDirectory();
+// Retrieves the path to the public downloads directory. The result is placed
+// in the FilePath pointed to by 'result'.
+bool GetDownloadsDirectory(FilePath* result);
 
-// Returns the path to the native JNI libraries via
-// ApplicationInfo.nativeLibraryDir on the Java side.
-std::string GetNativeLibraryDirectory();
+// Retrieves the path to the native JNI libraries via
+// ApplicationInfo.nativeLibraryDir on the Java side. The result is placed in
+// the FilePath pointed to by 'result'.
+bool GetNativeLibraryDirectory(FilePath* result);
 
-// Returns the absolute path to the external storage directory.
-std::string GetExternalStorageDirectory();
+// Retrieves the absolute path to the external storage directory. The result
+// is placed in the FilePath pointed to by 'result'.
+bool GetExternalStorageDirectory(FilePath* result);
 
 bool RegisterPathUtils(JNIEnv* env);