summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-03 05:42:45 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-03 05:42:45 +0000
commite99977ceff19046bb4620706c7b30acc3a2a4a75 (patch)
tree2485c8b74eafc5721cd82bdca29ac0d96d6577b6 /base
parentff2f1b7e01191a951fb95c4f2325c072cd2fda3c (diff)
downloadchromium_src-e99977ceff19046bb4620706c7b30acc3a2a4a75.zip
chromium_src-e99977ceff19046bb4620706c7b30acc3a2a4a75.tar.gz
chromium_src-e99977ceff19046bb4620706c7b30acc3a2a4a75.tar.bz2
Revert "Remove dependency on GTK from base/test_suite.h"
This reverts commit r13064. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13073 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/test_suite.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/base/test_suite.h b/base/test_suite.h
index 03937d5..5424925 100644
--- a/base/test_suite.h
+++ b/base/test_suite.h
@@ -23,6 +23,8 @@
#if defined(OS_WIN)
#include <windows.h>
+#elif defined(OS_LINUX)
+#include <gtk/gtk.h>
#endif
class TestSuite {
@@ -31,6 +33,9 @@ class TestSuite {
base::EnableTerminationOnHeapCorruption();
CommandLine::Init(argc, argv);
testing::InitGoogleTest(&argc, argv);
+#if defined(OS_LINUX)
+ gtk_init_check(&argc, &argv);
+#endif
// Don't add additional code to this constructor. Instead add it to
// Initialize(). See bug 6436.
}