diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 01:12:19 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 01:12:19 +0000 |
| commit | 64ce9d05bec75b48bba0814868c9bf472ba3eebb (patch) | |
| tree | dfa47d1c44137429228d1f57068747308c86b055 /content | |
| parent | 593a44af541a08197c132f28f3134bd5860f4fa0 (diff) | |
| download | chromium_src-64ce9d05bec75b48bba0814868c9bf472ba3eebb.zip chromium_src-64ce9d05bec75b48bba0814868c9bf472ba3eebb.tar.gz chromium_src-64ce9d05bec75b48bba0814868c9bf472ba3eebb.tar.bz2 | |
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
Diffstat (limited to 'content')
| -rw-r--r-- | content/test/DEPS | 1 | ||||
| -rw-r--r-- | content/test/content_test_suite.cc | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/content/test/DEPS b/content/test/DEPS index 9c61f8f..3227a5e 100644 --- a/content/test/DEPS +++ b/content/test/DEPS @@ -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", ] diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc index d2c8204..1fc9d35 100644 --- a/content/test/content_test_suite.cc +++ b/content/test/content_test_suite.cc @@ -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); |