Upstreaming chrome/common/chrome_* diff.

base/base_paths_android.cc

Index: base/base_paths_android.cc
diff --git a/base/base_paths_android.cc b/base/base_paths_android.cc
index ab14ee3ad23b5611fa0b7311647b8fc089377e0a..9905200382e3a71e95fab6ecc6683af47f3bee5e 100644
--- a/base/base_paths_android.cc
+++ b/base/base_paths_android.cc
@@ -35,28 +35,23 @@ bool PathProviderAndroid(int key, FilePath* result) {
       NOTIMPLEMENTED();
       return false;
     case base::DIR_MODULE:
-      *result = FilePath(base::android::GetNativeLibraryDirectory());
-      return true;
+      return base::android::GetNativeLibraryDirectory(result);
     case base::DIR_SOURCE_ROOT:
       // This const is only used for tests.
-      *result = FilePath(base::android::GetExternalStorageDirectory());
-      return true;
+      return base::android::GetExternalStorageDirectory(result);
     case base::DIR_USER_DESKTOP:
       // Android doesn't support GetUserDesktop.
       NOTIMPLEMENTED();
       return false;
     case base::DIR_CACHE:
-      *result = FilePath(base::android::GetCacheDirectory());
-      return true;
+      return base::android::GetCacheDirectory(result);
     case base::DIR_ANDROID_APP_DATA:
-      *result = FilePath(base::android::GetDataDirectory());
-      return true;
+      return base::android::GetDataDirectory(result);
     case base::DIR_HOME:
       *result = file_util::GetHomeDir();
       return true;
     case base::DIR_ANDROID_EXTERNAL_STORAGE:
-      *result = FilePath(base::android::GetExternalStorageDirectory());
-      return true;
+      return base::android::GetExternalStorageDirectory(result);
     default:
       // Note: the path system expects this function to override the default
       // behavior. So no need to log an error if we don't support a given