diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-08 20:03:54 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-08 20:03:54 +0000 |
| commit | 6a271dbaace85b14f566eba159b620de2172913f (patch) | |
| tree | 6e2331da6d7e5b004383dd3ffaab6132b4e19087 /chrome/test | |
| parent | d9fde8deca892d79f064746e322cf6270d289a18 (diff) | |
| download | chromium_src-6a271dbaace85b14f566eba159b620de2172913f.zip chromium_src-6a271dbaace85b14f566eba159b620de2172913f.tar.gz chromium_src-6a271dbaace85b14f566eba159b620de2172913f.tar.bz2 | |
Get rid of mac_app_names.h. Replace it with real constants from
chrome_constants.h.
As a side effect of this change, tests will use the framework in the build
directory as their main bundle override for the purposes of resource loading,
instead of looking into the framework inside the application bundle. This
should be more than sufficient, and is done for simplicity, because a future
change will make it more difficult to locate the correct framework inside the
application bundle unless the product version number is known.
BUG=24220
TEST=product still works and all tests still pass
Review URL: http://codereview.chromium.org/266023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/unit/chrome_test_suite.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/chrome/test/unit/chrome_test_suite.h b/chrome/test/unit/chrome_test_suite.h index 145c330..15d262d 100644 --- a/chrome/test/unit/chrome_test_suite.h +++ b/chrome/test/unit/chrome_test_suite.h @@ -22,11 +22,9 @@ #include "base/test_suite.h" #include "chrome/app/scoped_ole_initializer.h" #include "chrome/browser/browser_process.h" +#include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#if defined(OS_MACOSX) -#include "chrome/common/mac_app_names.h" -#endif #include "chrome/test/testing_browser_process.h" #include "net/base/mock_host_resolver.h" #include "net/base/net_util.h" @@ -101,10 +99,7 @@ class ChromeTestSuite : public TestSuite { // 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); + path = path.Append(chrome::kFrameworkName); mac_util::SetOverrideAppBundlePath(path); #endif |