Unfork test_shell_main_gtk back into test_shell_main.

webkit/tools/test_shell/SConscript

 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 Import('env', 'env_res')
 
 env = env.Clone()
 env_res = env_res.Clone()
 
 if env['PLATFORM'] == 'win32':
@@ skipping 124 matching lines @@
       '$NET_DIR/net_resources.res',
       '$WEBKIT_DIR/build/localized_strings/webkit_strings_en-US.res',
   ]
 
   exe_input_files = [
       'test_shell_main.cc',
       '$V8_DIR/snapshot-empty$OBJSUFFIX'
   ]
 elif env['PLATFORM'] == 'posix':
   exe_input_files = [
-      'test_shell_main_gtk.cc',
+      'test_shell_main.cc',

[tony, 2008/11/13 22:21:15]

Nit: Can we remove this and the one 5 lines above and put it into the main
input_files section?

   ]
 
 test_shell = env.ChromeProgram('test_shell', resources + exe_input_files)
 
 i = env.Install('$TARGET_ROOT', test_shell)
 env.Alias('webkit', i)
 
 if env['PLATFORM'] == 'win32':
   env.Depends(test_shell, '$V8_DIR/vc80.pdb')
 
@@ skipping 34 matching lines @@
       # Commented out until a regression is fixed and this file is restored.
       #'$WEBKIT_DIR/glue/stringimpl_unittest.cc',
       '$WEBKIT_DIR/glue/webplugin_impl_unittest.cc',
   ])
 
 test_shell_tests = env.ChromeTestProgram('test_shell_tests',
                                          resources + test_files)
 i = env.Install('$TARGET_ROOT', test_shell_tests)
 env.Alias('webkit', i)