summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui/history_uitest.cc
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-13 23:34:24 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-13 23:34:24 +0000
commitd1a5941efcd68dddd76d411f276353f34bb93f76 (patch)
tree95030e03f2e5dd16b0fab9da3b8fc4bd64d25b96 /chrome/test/ui/history_uitest.cc
parent874755ab46efe9e3b84b4c6b479e5dc813e93445 (diff)
downloadchromium_src-d1a5941efcd68dddd76d411f276353f34bb93f76.zip
chromium_src-d1a5941efcd68dddd76d411f276353f34bb93f76.tar.gz
chromium_src-d1a5941efcd68dddd76d411f276353f34bb93f76.tar.bz2
linux: More automation porting.
I have verified that this is working on Linux, but still have yet to enable any new automated tests. Baby steps. BUG=19076 Review URL: http://codereview.chromium.org/164446 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23386 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui/history_uitest.cc')
-rw-r--r--chrome/test/ui/history_uitest.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/chrome/test/ui/history_uitest.cc b/chrome/test/ui/history_uitest.cc
index e2ba8a4..3a65d4f 100644
--- a/chrome/test/ui/history_uitest.cc
+++ b/chrome/test/ui/history_uitest.cc
@@ -93,8 +93,7 @@ TEST_F(HistoryTester, DISABLED_VerifyHistoryLength) {
kTestCompleteSuccess, action_max_timeout_ms());
}
-#if defined(OS_WIN)
-// This test requires simulated mouse click, which is possible only for Windows.
+#if defined(OS_WIN) || defined(OS_LINUX)
TEST_F(HistoryTester, DISABLED_ConsiderRedirectAfterGestureAsUserInitiated) {
// Test the history length for the following page transition.
//
@@ -116,15 +115,15 @@ TEST_F(HistoryTester, DISABLED_ConsiderRedirectAfterGestureAsUserInitiated) {
gfx::Rect tab_view_bounds;
ASSERT_TRUE(window->GetViewBounds(VIEW_ID_TAB_CONTAINER, &tab_view_bounds,
true));
- POINT point(tab_view_bounds.CenterPoint().ToPOINT());
ASSERT_TRUE(
- window->SimulateOSClick(point, views::Event::EF_LEFT_BUTTON_DOWN));
+ window->SimulateOSClick(tab_view_bounds.CenterPoint(),
+ views::Event::EF_LEFT_BUTTON_DOWN));
- NavigateToURL(GURL("javascript:redirectToPage12()"));
+ NavigateToURL(GURL("javascript:redirectToPage12()"));
WaitForFinish("History_Length_Test_12", "1", url, kTestCompleteCookie,
kTestCompleteSuccess, action_max_timeout_ms());
}
-#endif // defined(OS_WIN)
+#endif // defined(OS_WIN) || defined(OS_LINUX)
TEST_F(HistoryTester, DISABLED_ConsiderSlowRedirectAsUserInitiated) {
// Test the history length for the following page transition.