Implement and refactor some test shell functions and enable a test.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4733 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 15 insertions, 4 deletions

diff --git a/webkit/tools/test_shell/run_all_tests.cc b/webkit/tools/test_shell/run_all_tests.cc
index 6b81c80..60de050 100644
--- a/webkit/tools/test_shell/run_all_tests.cc
+++ b/webkit/tools/test_shell/run_all_tests.cc
@@ -10,9 +10,12 @@
 #if defined(OS_WIN)
 #include <windows.h>
 #include <commctrl.h>
+#elif defined(OS_LINUX)
+#include <gtk/gtk.h>
 #endif
 
 #include "base/at_exit.h"
+#include "base/command_line.h"
 #include "base/icu_util.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
@@ -36,13 +39,17 @@ int main(int argc, char* argv[]) {
   // the AtExitManager or else we will leak objects.
   base::AtExitManager at_exit_manager;  
 
+#if defined(OS_LINUX)
+  gtk_init(&argc, &argv);
+#endif
+
+#if defined(OS_POSIX)
+  CommandLine::SetArgcArgv(argc, argv);
+#endif
+
 #if defined(OS_WIN)
   TestShell::InitLogging(true, false);  // suppress error dialogs
 
-  // Initialize test shell in non-interactive mode, which will let us load one
-  // request than automatically quit.
-  TestShell::InitializeTestShell(false);
-
   // Some of the individual tests wind up calling TestShell::WaitTestFinished
   // which has a timeout in it.  For these tests, we don't care about a timeout
   // so just set it to be a really large number.  This is necessary because
@@ -50,6 +57,10 @@ int main(int argc, char* argv[]) {
   TestShell::SetFileTestTimeout(USER_TIMER_MAXIMUM);
 #endif
 
+  // Initialize test shell in non-interactive mode, which will let us load one
+  // request than automatically quit.
+  TestShell::InitializeTestShell(false);
+
   // Allocate a message loop for this thread.  Although it is not used
   // directly, its constructor sets up some necessary state.
   MessageLoop main_message_loop;