diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-12 16:24:39 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-12 16:24:39 +0000 |
| commit | 33bf302e886c7885cd0198a60aee1d09d42ad0d2 (patch) | |
| tree | 93c347b00f213b7fe09887a7de9d4acec9f05232 /ui/views/run_all_unittests.cc | |
| parent | 5f817bfd777e19b25731e7ee5f932bd4ab26a4e9 (diff) | |
| download | chromium_src-33bf302e886c7885cd0198a60aee1d09d42ad0d2.zip chromium_src-33bf302e886c7885cd0198a60aee1d09d42ad0d2.tar.gz chromium_src-33bf302e886c7885cd0198a60aee1d09d42ad0d2.tar.bz2 | |
ui: Make views_unittests not depend on chrome's packed_resources target.
Depending on chrome's target is a layer violation, so we should break that dependency.
BUG=299841,176960,144345
TEST=views_unittests
R=tony@chromium.org
Review URL: https://codereview.chromium.org/45753004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234537 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/run_all_unittests.cc')
| -rw-r--r-- | ui/views/run_all_unittests.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ui/views/run_all_unittests.cc b/ui/views/run_all_unittests.cc index 22162ab..8cf0a25 100644 --- a/ui/views/run_all_unittests.cc +++ b/ui/views/run_all_unittests.cc @@ -5,6 +5,7 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/compiler_specific.h" +#include "base/path_service.h" #include "base/test/launcher/unit_test_launcher.h" #include "base/test/test_suite.h" #include "ui/base/resource/resource_bundle.h" @@ -19,7 +20,14 @@ class ViewTestSuite : public base::TestSuite { virtual void Initialize() OVERRIDE { base::TestSuite::Initialize(); ui::RegisterPathProvider(); - 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::InitSharedInstanceWithPakPath(pak_file); } private: |