0

Take out ResourceBundle initialization from ContentTestSuite. This isn't needed right now, and it's causing issues on ChromeOS heapcheck bot.

Review URL: https://codereview.chromium.org/11092089

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161467 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
jam@chromium.org
2012-10-12 01:12:19 +00:00
parent 593a44af54
commit 64ce9d05be
2 changed files with 0 additions and 6 deletions

@ -4,5 +4,4 @@ include_rules = [
"+media/base", # For ChannelLayout in WebRTC tests.
"+ui/aura/test/test_aura_initializer.h",
"+ui/base/resource/data_pack.h",
"+ui/base/resource/resource_bundle.h",
]

@ -8,7 +8,6 @@
#include "content/public/test/test_content_client_initializer.h"
#include "content/test/test_content_client.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/resource/resource_bundle.h"
#if defined(USE_AURA)
#include "ui/aura/test/test_aura_initializer.h"
@ -61,10 +60,6 @@ void ContentTestSuite::Initialize() {
ContentTestSuiteBase::Initialize();
// Force unittests to run using en-US so if we test against string
// output, it'll pass regardless of the system language.
ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
testing::TestEventListeners& listeners =
testing::UnitTest::GetInstance()->listeners();
listeners.Append(new TestInitializationListener);