Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1922)

Unified Diff: base/test/test_suite.cc

Issue 854713003: More old files deletion. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Fix tryjobs? Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/test/test_suite.cc
diff --git a/base/test/test_suite.cc b/base/test/test_suite.cc
index a6fc201113e5d84447bbec9adc48afc69693042b..383b82c09769d6348427a3ceaf68c5e1eaef45d7 100644
--- a/base/test/test_suite.cc
+++ b/base/test/test_suite.cc
@@ -135,12 +135,12 @@ void TestSuite::PreInitialize(bool create_at_exit_manager) {
testing::GTEST_FLAG(catch_exceptions) = false;
#endif
base::EnableTerminationOnHeapCorruption();
-#if defined(OS_LINUX) && defined(USE_AURA)
+#if defined(OS_LINUX) && !defined(OS_ANDROID)
// When calling native char conversion functions (e.g wrctomb) we need to
// have the locale set. In the absence of such a call the "C" locale is the
// default. In the gtk code (below) gtk_init() implicitly sets a locale.
setlocale(LC_ALL, "");
-#endif // defined(OS_LINUX) && defined(USE_AURA)
+#endif // defined(OS_LINUX) && !defined(OS_ANDROID)
// On Android, AtExitManager is created in
// testing/android/native_test_wrapper.cc before main() is called.
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698