summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-21 14:01:36 +0000
committerrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-21 14:01:36 +0000
commitace7213ffdee41f62ff19e0b3c841dace26b3ce9 (patch)
tree7f84096f6f9b34a4a3ab2d2b40d4e331cd80241a
parentaa43bc0f41919fc60b075e2e635985108bb0b870 (diff)
downloadchromium_src-ace7213ffdee41f62ff19e0b3c841dace26b3ce9.zip
chromium_src-ace7213ffdee41f62ff19e0b3c841dace26b3ce9.tar.gz
chromium_src-ace7213ffdee41f62ff19e0b3c841dace26b3ce9.tar.bz2
Mark GeolocationBrowserTest.NoInfobarForDeniedOrigin as flaky on the mac.
BUG=47053 TEST=none TBR=avi Review URL: http://codereview.chromium.org/2821013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50347 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/geolocation/geolocation_browsertest.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc
index c4e4822..db4f900 100644
--- a/chrome/browser/geolocation/geolocation_browsertest.cc
+++ b/chrome/browser/geolocation/geolocation_browsertest.cc
@@ -378,7 +378,14 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, DISABLED_NoInfobarForSecondTab) {
CheckGeoposition(MockLocationProvider::instance_->position_);
}
-IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, NoInfobarForDeniedOrigin) {
+#if defined(OS_MACOSX)
+// Fails sometimes on mac: http://crbug.com/47053
+#define MAYBE_NoInfobarForDeniedOrigin FLAKY_NoInfobarForDeniedOrigin
+#else
+#define MAYBE_NoInfobarForDeniedOrigin NoInfobarForDeniedOrigin
+#endif
+
+IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_NoInfobarForDeniedOrigin) {
ASSERT_TRUE(Initialize(INITIALIZATION_NONE));
current_browser_->profile()->GetGeolocationContentSettingsMap()->
SetContentSetting(current_url_, current_url_, CONTENT_SETTING_BLOCK);