summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-15 22:25:27 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-15 22:25:27 +0000
commit9ebc96929053724b02f598290f469f1d8373a2b6 (patch)
treeda78645c9d1a28e3a98d92d9096b1fa5aa9e4de6 /chrome/test/ui
parent9ffcccf40f192a9b172f86203ce5a4e0cff4320c (diff)
downloadchromium_src-9ebc96929053724b02f598290f469f1d8373a2b6.zip
chromium_src-9ebc96929053724b02f598290f469f1d8373a2b6.tar.gz
chromium_src-9ebc96929053724b02f598290f469f1d8373a2b6.tar.bz2
Revert "First part of automated_ui_tests improvements."
Revert "Fix Mac by disabling some UI tests on it." Too many failures. TBR=huanr Review URL: http://codereview.chromium.org/193118 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26281 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui')
-rw-r--r--chrome/test/ui/ui_test.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index cacd59d0..b59d71f 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -500,6 +500,10 @@ bool UITest::WaitForDownloadShelfVisibilityChange(BrowserProxy* browser,
return false;
}
+// TODO(port): this #if effectively cuts out half of this file on
+// non-Windows platforms, and is a temporary hack to get things
+// building.
+#if defined(OS_WIN)
bool UITest::WaitForFindWindowVisibilityChange(BrowserProxy* browser,
bool wait_for_open) {
const int kCycles = 10;
@@ -532,6 +536,7 @@ bool UITest::WaitForBookmarkBarVisibilityChange(BrowserProxy* browser,
}
return false;
}
+#endif // defined(OS_WIN)
GURL UITest::GetActiveTabURL(int window_index) {
scoped_refptr<TabProxy> tab_proxy(GetActiveTab(window_index));