diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-23 06:44:11 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-23 06:44:11 +0000 |
| commit | 97c9e77b34099c518f85571f6d36e178d7695b23 (patch) | |
| tree | 39edb401d0c1964c92b16ce05aff57ced64bdf63 /webkit/support | |
| parent | 338f58d417f15d9a7237e18c6a0ef3fd684107cc (diff) | |
| download | chromium_src-97c9e77b34099c518f85571f6d36e178d7695b23.zip chromium_src-97c9e77b34099c518f85571f6d36e178d7695b23.tar.gz chromium_src-97c9e77b34099c518f85571f6d36e178d7695b23.tar.bz2 | |
Fix DumpRenderTree on Linux. It was crashing on startup because
AtExitManager needs to be initialized before icu::Initialize()
is called.
Review URL: http://codereview.chromium.org/1719012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45423 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support')
| -rw-r--r-- | webkit/support/webkit_support.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index 0c48509..f42ffc4 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -80,11 +80,12 @@ static TestEnvironment* test_environment; void SetUpTestEnvironment() { base::EnableTerminationOnHeapCorruption(); - // Load ICU data tables - icu_util::Initialize(); BeforeInitialize(); test_environment = new TestEnvironment; AfterIniitalize(); + // Load ICU data tables. This has to run after TestEnvironment is created + // because on Linux, we need base::AtExitManager. + icu_util::Initialize(); } void TearDownTestEnvironment() { |