diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-11 04:28:07 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-11 04:28:07 +0000 |
| commit | 5b3e88a0e4aaecdebb16af89f1e24635973a1f4c (patch) | |
| tree | 75933a923df33097106f4c520d1cf7b62a41d555 /content/test/content_test_suite.cc | |
| parent | 5482ef9ec189ae47ae1567eee7707de464e9325d (diff) | |
| download | chromium_src-5b3e88a0e4aaecdebb16af89f1e24635973a1f4c.zip chromium_src-5b3e88a0e4aaecdebb16af89f1e24635973a1f4c.tar.gz chromium_src-5b3e88a0e4aaecdebb16af89f1e24635973a1f4c.tar.bz2 | |
Get rid of TestAuraInitializer.
This is a followup to crrev.com/238564 where we reused ui_test_pak in
aura_test_support. We remove TestAuraInitializer and
just merge the code into ContentTestSuite, that seems to be the most
suitable approach.
BUG=None
TEST=content_unittests,ash_unittests
R=ben@chromium.org,tony@chromium.org
Review URL: https://codereview.chromium.org/109093002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240011 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/content_test_suite.cc')
| -rw-r--r-- | content/test/content_test_suite.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc index 1fc9d35..3618365 100644 --- a/content/test/content_test_suite.cc +++ b/content/test/content_test_suite.cc @@ -4,14 +4,13 @@ #include "content/test/content_test_suite.h" +#include "base/base_paths.h" #include "base/logging.h" +#include "base/path_service.h" #include "content/public/test/test_content_client_initializer.h" #include "content/test/test_content_client.h" #include "testing/gtest/include/gtest/gtest.h" - -#if defined(USE_AURA) -#include "ui/aura/test/test_aura_initializer.h" -#endif +#include "ui/base/resource/resource_bundle.h" #if defined(OS_MACOSX) #include "base/mac/scoped_nsautorelease_pool.h" @@ -46,11 +45,17 @@ namespace content { ContentTestSuite::ContentTestSuite(int argc, char** argv) : ContentTestSuiteBase(argc, argv) { #if defined(USE_AURA) - aura_initializer_.reset(new aura::test::TestAuraInitializer); + base::FilePath pak_file; + PathService::Get(base::DIR_MODULE, &pak_file); + pak_file = pak_file.AppendASCII("ui_test.pak"); + ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file); #endif } ContentTestSuite::~ContentTestSuite() { +#if defined(USE_AURA) + ui::ResourceBundle::CleanupSharedInstance(); +#endif } void ContentTestSuite::Initialize() { |