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

Unified Diff: base/base_paths_mac.mm

Issue 10790008: Adds a way to specify test data files for unittests. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Use <(DEPTH). Created 8 years, 5 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
« no previous file with comments | « base/base.gyp ('k') | build/copy_test_data_ios.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base_paths_mac.mm
diff --git a/base/base_paths_mac.mm b/base/base_paths_mac.mm
index aed3ea8e3eb787de288e1c702fd120e752be91d8..a029706e671cd07016cbdf2b6741bbb9264a4348 100644
--- a/base/base_paths_mac.mm
+++ b/base/base_paths_mac.mm
@@ -68,6 +68,8 @@ bool PathProviderMac(int key, FilePath* result) {
// Start with the executable's directory.
*result = result->DirName();
+
+#if !defined(OS_IOS)
if (base::mac::AmIBundled()) {
// The bundled app executables (Chromium, TestShell, etc) live five
// levels down, eg:
@@ -78,6 +80,7 @@ bool PathProviderMac(int key, FilePath* result) {
// src/xcodebuild/{Debug|Release}/base_unittests
*result = result->DirName().DirName();
}
+#endif
return true;
}
default:
« no previous file with comments | « base/base.gyp ('k') | build/copy_test_data_ios.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698