summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-22 13:43:04 +0000
committerbulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-22 13:43:04 +0000
commit42aec0de8b7530892952bb0944115ee9ec48ee18 (patch)
treeb9406e0b3c5e0e51956603fb43a36f576877e7de
parent1a96b432de916d958dd03404701405c981fbaff3 (diff)
downloadchromium_src-42aec0de8b7530892952bb0944115ee9ec48ee18.zip
chromium_src-42aec0de8b7530892952bb0944115ee9ec48ee18.tar.gz
chromium_src-42aec0de8b7530892952bb0944115ee9ec48ee18.tar.bz2
Disables Geolocation tests for mac
(follow on up http://codereview.chromium.org/1134001) TEST=geolocation_browsertest.cc Review URL: http://codereview.chromium.org/1149007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42214 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/geolocation/geolocation_browsertest.cc13
1 files changed, 11 insertions, 2 deletions
diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc
index 316ac21..131d78c 100644
--- a/chrome/browser/geolocation/geolocation_browsertest.cc
+++ b/chrome/browser/geolocation/geolocation_browsertest.cc
@@ -452,9 +452,9 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_Geoposition) {
#if defined(OS_MACOSX)
// TODO(bulach): investigate why this fails on mac. It may be related to:
// http://crbug.com//29424
-#define MAYBE_IFramesWithCachedPosition DISABLED_IFramesWithCachedPosition
+#define MAYBE_IFramesWithFreshPosition DISABLED_IFramesWithFreshPosition
#else
-#define MAYBE_IFramesWithCachedPosition DISABLED_IFramesWithCachedPosition
+#define MAYBE_IFramesWithFreshPosition IFramesWithFreshPosition
#endif
IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest,
@@ -495,8 +495,17 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest,
CheckGeoposition(geoposition);
}
+
+#if defined(OS_MACOSX)
+// TODO(bulach): investigate why this fails on mac. It may be related to:
+// http://crbug.com//29424
+#define MAYBE_IFramesWithCachedPosition DISABLED_IFramesWithCachedPosition
+#else
// TODO(bulach): enable this test when we roll to
// https://bugs.webkit.org/show_bug.cgi?id=36315
+#define MAYBE_IFramesWithCachedPosition DISABLED_IFramesWithCachedPosition
+#endif
+
IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest,
MAYBE_IFramesWithCachedPosition) {
html_for_tests_ = "files/geolocation/iframes_different_origin.html";