diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-20 14:50:51 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-20 14:50:51 +0000 |
| commit | a9585718f3a0cbe83fe8deb5eb7dbc86956786e9 (patch) | |
| tree | d4d6675a5ae432db93d535cecac26d060969a670 /ui | |
| parent | 4ee840f18108b1d60282dc3e0b900390966d691e (diff) | |
| download | chromium_src-a9585718f3a0cbe83fe8deb5eb7dbc86956786e9.zip chromium_src-a9585718f3a0cbe83fe8deb5eb7dbc86956786e9.tar.gz chromium_src-a9585718f3a0cbe83fe8deb5eb7dbc86956786e9.tar.bz2 | |
ui: Move resource_bundle_unittest.cc from app.gyp to ui_unittests.gypi.
This was the last remaining test to move.
BUG=72317
TEST=ui_unittests
R=rsesek@chromium.org
Review URL: http://codereview.chromium.org/7201011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89665 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gfx/test_suite.cc | 16 | ||||
| -rw-r--r-- | ui/ui_unittests.gypi | 1 |
2 files changed, 17 insertions, 0 deletions
diff --git a/ui/gfx/test_suite.cc b/ui/gfx/test_suite.cc index 5d65ec4..cee5118 100644 --- a/ui/gfx/test_suite.cc +++ b/ui/gfx/test_suite.cc @@ -7,6 +7,8 @@ #include "base/file_path.h" #include "base/path_service.h" #include "build/build_config.h" +#include "ui/base/resource/resource_bundle.h" +#include "ui/base/ui_base_paths.h" #include "ui/gfx/gfx_paths.h" #if defined(OS_MACOSX) @@ -19,6 +21,7 @@ void GfxTestSuite::Initialize() { base::TestSuite::Initialize(); gfx::RegisterPathProvider(); + ui::RegisterPathProvider(); #if defined(OS_MACOSX) // Look in the framework bundle for resources. @@ -35,10 +38,23 @@ void GfxTestSuite::Initialize() { #error Unknown branding #endif base::mac::SetOverrideAppBundlePath(path); +#elif defined(OS_POSIX) + FilePath pak_dir; + PathService::Get(base::DIR_MODULE, &pak_dir); + pak_dir = pak_dir.AppendASCII("app_unittests_strings"); + PathService::Override(ui::DIR_LOCALES, pak_dir); + PathService::Override(ui::FILE_RESOURCES_PAK, + pak_dir.AppendASCII("app_resources.pak")); #endif // OS_MACOSX + + // Force unittests to run using en-US so if we test against string + // output, it'll pass regardless of the system language. + ui::ResourceBundle::InitSharedInstance("en-US"); } void GfxTestSuite::Shutdown() { + ui::ResourceBundle::CleanupSharedInstance(); + #if defined(OS_MACOSX) base::mac::SetOverrideAppBundle(NULL); #endif diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi index 479af7c..f226b40 100644 --- a/ui/ui_unittests.gypi +++ b/ui/ui_unittests.gypi @@ -31,6 +31,7 @@ 'base/range/range_unittest.cc', 'base/range/range_unittest.mm', 'base/resource/data_pack_unittest.cc', + 'base/resource/resource_bundle_unittest.cc', 'base/test/data/resource.h', 'base/text/text_elider_unittest.cc', 'gfx/blit_unittest.cc', |