Port more UI tests to Linux.

- enable following ui tests on Linux:
    history_uitest.cc
    inspector_controller_uitest.cc
    browser/history/redirect_uitest.cc
    browser/locale_tests_uitest.cc
    browser/sanity_uitest.cc

- move information about Linux-specific splash page
  to more generic location and enable more logic
  about start page on Linux

- maintainability cleanups (DISABLED_ instead of #if 0)

- misc GCC-related cleanups

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

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

2 files changed, 2 insertions, 12 deletions

diff --git a/chrome/test/ui/inspector_controller_uitest.cc b/chrome/test/ui/inspector_controller_uitest.cc
index 140e6f4..6bf9664 100644
--- a/chrome/test/ui/inspector_controller_uitest.cc
+++ b/chrome/test/ui/inspector_controller_uitest.cc
@@ -3,16 +3,14 @@
 // found in the LICENSE file.
 
 #include "base/command_line.h"
-#include "base/no_windows2000_unittest.h"
-#include "base/win_util.h"
+#include "base/scoped_ptr.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "net/url_request/url_request_unittest.h"
 
-// This test does not work on win2k. See http://b/1070036
-class InspectorControllerTest : public NoWindows2000Test<UITest> {
+class InspectorControllerTest : public UITest {
  protected:
   TabProxy* GetActiveTabProxy() {
     scoped_ptr<BrowserProxy> window_proxy(automation()->GetBrowserWindow(0));
@@ -31,9 +29,6 @@ class InspectorControllerTest : public NoWindows2000Test<UITest> {
 // This test also does not work in single process. See http://b/1214920
 // Disabled, see http://crbug.com/4655
 TEST_F(InspectorControllerTest, DISABLED_InspectElement) {
-  if (IsTestCaseDisabled())
-    return;
-
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess))
     return;
 
diff --git a/chrome/test/ui/ui_tests.scons b/chrome/test/ui/ui_tests.scons
index c282092..0945b4e3 100644
--- a/chrome/test/ui/ui_tests.scons
+++ b/chrome/test/ui/ui_tests.scons
@@ -234,8 +234,6 @@ input_files = ChromeFileList([
 if not env.Bit('windows'):
   # TODO(port): mark which of these work and which don't.
   input_files.Remove(
-      'history_uitest.cc',
-      'inspector_controller_uitest.cc',
       'layout_plugin_uitest.cpp',
       'npapi_test_helper.cc',
       'npapi_uitest.cpp',
@@ -250,15 +248,12 @@ if not env.Bit('windows'):
       '$CHROME_DIR/browser/download/download_uitest.cc',
       '$CHROME_DIR/browser/download/save_page_uitest.cc',
       '$CHROME_DIR/browser/errorpage_uitest.cc',
-      '$CHROME_DIR/browser/history/redirect_uitest.cc',
       '$CHROME_DIR/browser/iframe_uitest.cc',
       '$CHROME_DIR/browser/interstitial_page_uitest.cc',
-      '$CHROME_DIR/browser/locale_tests_uitest.cc',
       '$CHROME_DIR/browser/login_prompt_uitest.cc',
       '$CHROME_DIR/browser/metrics/metrics_service_uitest.cc',
       '$CHROME_DIR/browser/printing/printing_layout_uitest.cc',
       '$CHROME_DIR/browser/renderer_host/resource_dispatcher_host_uitest.cc',
-      '$CHROME_DIR/browser/sanity_uitest.cc',
       '$CHROME_DIR/browser/session_history_uitest.cc',
       '$CHROME_DIR/browser/sessions/session_restore_uitest.cc',
       '$CHROME_DIR/browser/ssl/ssl_uitest.cc',