diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-20 23:19:46 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-20 23:19:46 +0000 |
| commit | 42ce29d4f464b36ddaebefb6d6c33e7418e93141 (patch) | |
| tree | 0d0a4965d61ef1514dee70c9f2507529d8c5b178 /app/test_suite.h | |
| parent | 0ffeb598304f119e2d3df70d47a592d2dbc722da (diff) | |
| download | chromium_src-42ce29d4f464b36ddaebefb6d6c33e7418e93141.zip chromium_src-42ce29d4f464b36ddaebefb6d6c33e7418e93141.tar.gz chromium_src-42ce29d4f464b36ddaebefb6d6c33e7418e93141.tar.bz2 | |
Move ResourceBundle, DataPack to ui/base
BUG=none
TEST=none
TBR=brettw
Review URL: http://codereview.chromium.org/6263008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72038 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/test_suite.h')
| -rw-r--r-- | app/test_suite.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/test_suite.h b/app/test_suite.h index 10e6b44..519f445 100644 --- a/app/test_suite.h +++ b/app/test_suite.h @@ -9,11 +9,12 @@ #include "build/build_config.h" #include "app/app_paths.h" -#include "app/resource_bundle.h" #include "base/path_service.h" #include "base/mac/scoped_nsautorelease_pool.h" #include "base/test/test_suite.h" #include "build/build_config.h" +#include "ui/base/resource/resource_bundle.h" +#include "ui/base/ui_base_paths.h" #if defined(OS_MACOSX) #include "base/mac/mac_util.h" @@ -38,6 +39,7 @@ class AppTestSuite : public base::TestSuite { TestSuite::Initialize(); app::RegisterPathProvider(); + ui::RegisterPathProvider(); #if defined(OS_MACOSX) // Look in the framework bundle for resources. // TODO(port): make a resource bundle for non-app exes. What's done here @@ -57,8 +59,8 @@ class AppTestSuite : public base::TestSuite { FilePath pak_dir; PathService::Get(base::DIR_MODULE, &pak_dir); pak_dir = pak_dir.AppendASCII("app_unittests_strings"); - PathService::Override(app::DIR_LOCALES, pak_dir); - PathService::Override(app::FILE_RESOURCES_PAK, + PathService::Override(ui::DIR_LOCALES, pak_dir); + PathService::Override(ui::FILE_RESOURCES_PAK, pak_dir.AppendASCII("app_resources.pak")); #endif |