summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui/ui_test.h
diff options
context:
space:
mode:
authorstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-23 21:42:33 +0000
committerstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-23 21:42:33 +0000
commit015ed8bbc256a94f03dacf13e93c05e4eff25dcd (patch)
tree479976899d3e957a77da598bb05ee145876219be /chrome/test/ui/ui_test.h
parent71d1ab42f849b22bc26bcf2756d5d664a5454884 (diff)
downloadchromium_src-015ed8bbc256a94f03dacf13e93c05e4eff25dcd.zip
chromium_src-015ed8bbc256a94f03dacf13e93c05e4eff25dcd.tar.gz
chromium_src-015ed8bbc256a94f03dacf13e93c05e4eff25dcd.tar.bz2
ifdef out tests that don't apply to the Mac
The reason these tests were failing on the Mac is that they test something that the Mac explicitly doesn't support: opening a new window in the existing browser process by re-running from the command line. This ifdefs out the tests that don't apply to the Mac, and the helper method that they are built on so that new tests using it won't accidentally be run on the Mac. BUG=45108 TEST=N/A Review URL: http://codereview.chromium.org/3394018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60354 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui/ui_test.h')
-rw-r--r--chrome/test/ui/ui_test.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h
index 7df0a8c..b2a11e6 100644
--- a/chrome/test/ui/ui_test.h
+++ b/chrome/test/ui/ui_test.h
@@ -85,9 +85,16 @@ class UITestBase {
// LaunchAnotherBrowserBlockUntilClosed.
void LaunchBrowser(const CommandLine& cmdline, bool clear_profile);
+#if !defined(OS_MACOSX)
+ // This function is deliberately not defined on the Mac because re-using an
+ // existing browser process when launching from the command line isn't a
+ // concept that we support on the Mac; AppleEvents are the Mac solution for
+ // the same need. Any test based on this function doesn't apply to the Mac.
+
// Launches an another browser process and waits for it to finish. Returns
// true on success.
bool LaunchAnotherBrowserBlockUntilClosed(const CommandLine& cmdline);
+#endif
// Exits out browser instance.
void QuitBrowser();