Commit 8eaaa149 authored by saintlou@chromium.org's avatar saintlou@chromium.org

Fix test failures when calling native char conversion functions (e.g wrctomb).

This initialization must have been implicit with gtk. On ChromeOS we go down a different code path for these tests.

TBR=phajdan.jr@chromium.org
BUG=106725
TEST=RTLTest.WrapPathWithLTRFormatting on Aura/Linux.


Review URL: http://codereview.chromium.org/8889002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113614 0039d316-1c4b-4281-b951-d872f2087c98
parent a1a10599
...@@ -78,7 +78,9 @@ TestSuite::TestSuite(int argc, char** argv) { ...@@ -78,7 +78,9 @@ TestSuite::TestSuite(int argc, char** argv) {
base::EnableTerminationOnHeapCorruption(); base::EnableTerminationOnHeapCorruption();
CommandLine::Init(argc, argv); CommandLine::Init(argc, argv);
testing::InitGoogleTest(&argc, argv); testing::InitGoogleTest(&argc, argv);
#if defined(TOOLKIT_USES_GTK) #if defined(OS_LINUX) && defined(USE_AURA)
setlocale(LC_ALL, "");
#elif defined(TOOLKIT_USES_GTK)
gtk_init_check(&argc, &argv); gtk_init_check(&argc, &argv);
#endif // defined(TOOLKIT_USES_GTK) #endif // defined(TOOLKIT_USES_GTK)
// Don't add additional code to this constructor. Instead add it to // Don't add additional code to this constructor. Instead add it to
......
...@@ -642,6 +642,7 @@ ...@@ -642,6 +642,7 @@
['OS=="linux"', { ['OS=="linux"', {
# Tests that currently only work on Linux. # Tests that currently only work on Linux.
'dependencies': [ 'dependencies': [
'../base/base.gyp:base_unittests',
'../chrome/chrome.gyp:sync_unit_tests', '../chrome/chrome.gyp:sync_unit_tests',
'../content/content.gyp:content_unittests', '../content/content.gyp:content_unittests',
'../ipc/ipc.gyp:ipc_tests', '../ipc/ipc.gyp:ipc_tests',
......
...@@ -523,6 +523,10 @@ void BrowserMainLoop::InitializeToolkit() { ...@@ -523,6 +523,10 @@ void BrowserMainLoop::InitializeToolkit() {
// requirement for gconf. // requirement for gconf.
g_type_init(); g_type_init();
#if defined(USE_AURA)
setlocale(LC_ALL, "");
#endif
#if !defined(USE_AURA) #if !defined(USE_AURA)
gfx::GtkInitFromCommandLine(parameters_.command_line); gfx::GtkInitFromCommandLine(parameters_.command_line);
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment