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

1 files changed, 3 insertions, 3 deletions

diff --git a/chrome/browser/iframe_uitest.cc b/chrome/browser/iframe_uitest.cc
index 6cd75b0..7e2e617 100644
--- a/chrome/browser/iframe_uitest.cc
+++ b/chrome/browser/iframe_uitest.cc
@@ -4,6 +4,7 @@
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
+#include "base/platform_thread.h"
 #include "chrome/test/ui/ui_test.h"
 #include "net/base/net_util.h"
 
@@ -14,7 +15,8 @@ class IFrameTest : public UITest {
     file_util::AppendToPath(&test_file, url);
 
     NavigateToURL(net::FilePathToFileURL(test_file));
-    Sleep(sleep_timeout_ms());  // The browser lazily updates the title.
+    // The browser lazily updates the title.
+    PlatformThread::Sleep(sleep_timeout_ms());
 
     // Make sure the navigation succeeded.
     EXPECT_EQ(std::wstring(page_title), GetActiveTabTitle());
@@ -28,8 +30,6 @@ TEST_F(IFrameTest, Crash) {
   NavigateAndVerifyTitle(L"iframe.html", L"iframe test");
 }
 
-// http://crbug.com/3035 : Triggers a DCHECK in web_contents.cc.  Need to
-// investigate.
 TEST_F(IFrameTest, InEmptyFrame) {
   NavigateAndVerifyTitle(L"iframe_in_empty_frame.html", L"iframe test");
 }