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

Unified Diff: ui/base/test/run_all_unittests.cc

Issue 152543005: Introduce a mock ui_unittests Framework for loading resources. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: More tests passing Created 6 years, 10 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 | « ui/base/test/framework-Info.plist ('k') | ui/ui_unittests.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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() {
« no previous file with comments | « ui/base/test/framework-Info.plist ('k') | ui/ui_unittests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698