summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-07 16:42:16 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-07 16:42:16 +0000
commite4221ad535d561b931bd900db9278825adf36b06 (patch)
tree5ca7bef32977d76773f975d13a34c11dd86eab04 /chrome/test
parent9997409a1d70d0f44936ce49227520406b543c6d (diff)
downloadchromium_src-e4221ad535d561b931bd900db9278825adf36b06.zip
chromium_src-e4221ad535d561b931bd900db9278825adf36b06.tar.gz
chromium_src-e4221ad535d561b931bd900db9278825adf36b06.tar.bz2
Move all resources into the framework.
BUG=14610 (in support of unbreaking auto-update) TEST=The .app's Contents/Resources folder should not contain the resources that are moving to the .framework's Resources folder; The .app's Contents/Resources folder should still contain app.icns, document.icns, the helper .app, and a whole slew of .lprojs that only contain InfoPlist.strings; Make sure Breakpad still works in the browser, renderer, and other process types. Review URL: http://codereview.chromium.org/256062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28262 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/unit/chrome_test_suite.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/test/unit/chrome_test_suite.h b/chrome/test/unit/chrome_test_suite.h
index 9c838a4..145c330 100644
--- a/chrome/test/unit/chrome_test_suite.h
+++ b/chrome/test/unit/chrome_test_suite.h
@@ -98,9 +98,13 @@ class ChromeTestSuite : public TestSuite {
PathService::Override(chrome::DIR_USER_DATA, user_data_dir);
#if defined(OS_MACOSX)
+ // Look in the framework bundle for resources.
FilePath path;
PathService::Get(base::DIR_EXE, &path);
path = path.AppendASCII(MAC_BROWSER_APP_NAME);
+ path = path.AppendASCII("Contents");
+ path = path.AppendASCII("Frameworks");
+ path = path.AppendASCII(MAC_FRAMEWORK_NAME);
mac_util::SetOverrideAppBundlePath(path);
#endif