Upstreaming chrome/common/chrome_* diff.

base/base_paths_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Defines base::PathProviderAndroid which replaces base::PathProviderPosix for
 // Android in base/path_service.cc.
 
 #include <unistd.h>
 
 #include "base/android/jni_android.h"
@@ skipping 17 matching lines @@
       }
       bin_dir[bin_dir_size] = 0;
       *result = FilePath(bin_dir);
       return true;
     }
     case base::FILE_MODULE:
       // dladdr didn't work in Android as only the file name was returned.
       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
       // path. The system will just use the default.
       return false;
   }
 }
 
 }  // namespace base