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

Unified Diff: base/base_paths_android.cc

Issue 1926793002: 👔 Move side-loaded test data /sdcard -> /sdcard/gtestdata (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix cast compile Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: base/base_paths_android.cc
diff --git a/base/base_paths_android.cc b/base/base_paths_android.cc
index 62b07dde07340f4d5a85071ff56d87f461ee0d2b..8a875d3a18e4a5572eda6c4d8356b40e80f5c7fe 100644
--- a/base/base_paths_android.cc
+++ b/base/base_paths_android.cc
@@ -40,7 +40,10 @@ bool PathProviderAndroid(int key, FilePath* result) {
return base::android::GetNativeLibraryDirectory(result);
case base::DIR_SOURCE_ROOT:
// This const is only used for tests.
- return base::android::GetExternalStorageDirectory(result);
+ if (!base::android::GetExternalStorageDirectory(result))
+ return false;
+ *result = result->Append(FILE_PATH_LITERAL("gtestdata"));
jbudorick 2016/04/27 19:59:01 What's the motivation behind putting this in "gtes
jbudorick 2016/04/27 20:00:30 (also, in the event we keep it, "gtestdata" is a b
agrieve 2016/04/27 20:26:31 chromium_test_root?
agrieve 2016/04/27 20:26:31 It's to avoid wiping the entire /sdcard when runni
jbudorick 2016/04/27 20:41:36 eh, I'd rather have our own sdcard subdirectory th
+ return true;
case base::DIR_USER_DESKTOP:
// Android doesn't support GetUserDesktop.
NOTIMPLEMENTED();

Powered by Google App Engine
This is Rietveld 408576698