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

Unified Diff: chrome/common/chrome_paths.cc

Issue 1908043002: [Mac] In unit_tests use the resources.pak in the framework bundle. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-chrome
Patch Set: 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
« no previous file with comments | « chrome/chrome_dll_bundle.gypi ('k') | chrome/test/base/chrome_unit_test_suite.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/chrome_paths.cc
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index 9b44155ad22fbe7284932b3f88355dd4f6f1e31d..c7462488e883bde329b393b3701d8040e384813b 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -359,12 +359,10 @@ bool PathProvider(int key, base::FilePath* result) {
#endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
case chrome::FILE_RESOURCES_PACK:
#if defined(OS_MACOSX)
- if (base::mac::AmIBundled()) {
- cur = base::mac::FrameworkBundlePath();
- cur = cur.Append(FILE_PATH_LITERAL("Resources"))
- .Append(FILE_PATH_LITERAL("resources.pak"));
- break;
- }
+ cur = base::mac::FrameworkBundlePath();
+ cur = cur.Append(FILE_PATH_LITERAL("Resources"))
+ .Append(FILE_PATH_LITERAL("resources.pak"));
+ break;
#elif defined(OS_ANDROID)
if (!PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &cur))
return false;
« no previous file with comments | « chrome/chrome_dll_bundle.gypi ('k') | chrome/test/base/chrome_unit_test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698