Chromium Code Reviews| Index: ui/base/test/run_all_unittests.cc |
| diff --git a/ui/base/test/run_all_unittests.cc b/ui/base/test/run_all_unittests.cc |
| index 0f94dacdeaf72ba90ac4f7d6ec7fb7c4f0a7d2b6..8fbbcd790fe2bb2063531e0d2ac765a205135839 100644 |
| --- a/ui/base/test/run_all_unittests.cc |
| +++ b/ui/base/test/run_all_unittests.cc |
| @@ -54,25 +54,20 @@ void UIBaseTestSuite::Initialize() { |
| #if defined(OS_MACOSX) && !defined(OS_IOS) |
| // Look in the framework bundle for resources. |
| - // TODO(port): make a resource bundle for non-app exes. What's done here |
| - // isn't really right because this code needs to depend on chrome_dll |
| - // being built. This is inappropriate in app. |
| base::FilePath path; |
| PathService::Get(base::DIR_EXE, &path); |
| -#if defined(GOOGLE_CHROME_BUILD) |
| - path = path.AppendASCII("Google Chrome Framework.framework"); |
| -#elif defined(CHROMIUM_BUILD) |
| - path = path.AppendASCII("Chromium Framework.framework"); |
| -#else |
| -#error Unknown branding |
| -#endif |
| + path = path.AppendASCII("ui_unittests Framework.framework"); |
|
tfarina
2014/02/07 01:06:27
Can we get this chunk landed first (and separate)
tfarina
2014/02/07 03:57:24
For reference, content_shell has a clean way to do
tapted
2014/02/28 08:10:56
Since we know it's a test binary running we can si
tapted
2014/02/28 08:10:56
I've added another symlink in the Framework bundle
|
| base::mac::SetOverrideFrameworkBundlePath(path); |
| #endif // defined(OS_MACOSX) && !defined(OS_IOS) |
| - // TODO(tfarina): This loads chrome_100_percent.pak and thus introduces a |
| - // dependency on chrome/, we don't want that here, so change this to |
| - // InitSharedInstanceWithPakPath(). |
| ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); |
| + |
| + base::FilePath pak_dir; |
| + PathService::Get(base::DIR_MODULE, &pak_dir); |
| + base::FilePath pak_file; |
| + pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak")); |
| + ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath( |
| + pak_file, ui::SCALE_FACTOR_100P); |
| } |
| void UIBaseTestSuite::Shutdown() { |