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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: base/test/test_suite.h

Issue 2043006: WTF NPAPI extension. Early draft. Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 10 years, 7 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.h
===================================================================
--- base/test/test_suite.h (revision 46298)
+++ base/test/test_suite.h (working copy)
@@ -57,8 +57,10 @@
CommandLine::Init(argc, argv);
testing::InitGoogleTest(&argc, argv);
#if defined(OS_POSIX) && !defined(OS_MACOSX)
- g_thread_init(NULL);
- gtk_init_check(&argc, &argv);
+ if (!g_thread_supported()) {
+ g_thread_init(NULL);
+ gtk_init_check(&argc, &argv);
+ }
#endif // defined(OS_LINUX)
// Don't add additional code to this constructor. Instead add it to
// Initialize(). See bug 6436.
« 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