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..8bdc37368369ab1074c1eb27675c6ca23714bbbe 100644
--- a/base/android/path_utils.h
+++ b/base/android/path_utils.h
@@ -8,28 +8,30 @@
 #include <jni.h>
 #include <string>

[nilesh, 2012/10/01 20:38:35]

Remove the include.

[aurimas (slooooooooow), 2012/10/01 21:06:41]

Done.

 
+class FilePath;
+
 namespace base {
 namespace android {
 
 // Return the absolute path to the data directory of the current application.

[nilesh, 2012/10/01 20:38:35]

Please update the comment. Something like:
"Retrieves the absolute path...."
The result is placed in the FilePath pointed to by 'result'

[aurimas (slooooooooow), 2012/10/01 21:06:41]

Done.

 // 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
 // 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();
+bool GetDownloadsDirectory(FilePath* result);
 
 // Returns the path to the native JNI libraries via
 // ApplicationInfo.nativeLibraryDir on the Java side.
-std::string GetNativeLibraryDirectory();
+bool GetNativeLibraryDirectory(FilePath* result);
 
 // Returns the absolute path to the external storage directory.
-std::string GetExternalStorageDirectory();
+bool GetExternalStorageDirectory(FilePath* result);
 
 bool RegisterPathUtils(JNIEnv* env);