diff options
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() { |