summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-15 16:45:14 +0000
committerjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-15 16:45:14 +0000
commitb26d25fc6644977a8dfe68ab8b6fd1b6f0eb2775 (patch)
tree5a9bea88e5cdcbf88a5e7b9e46626ee530977b72
parent6b3dacec4872c1236d451dea72578ff67a189986 (diff)
downloadchromium_src-b26d25fc6644977a8dfe68ab8b6fd1b6f0eb2775.zip
chromium_src-b26d25fc6644977a8dfe68ab8b6fd1b6f0eb2775.tar.gz
chromium_src-b26d25fc6644977a8dfe68ab8b6fd1b6f0eb2775.tar.bz2
NoInfobarForDeniedOrigin no longer appears flaky (last seen July 10)
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59507 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/geolocation/geolocation_browsertest.cc9
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc
index a658f56..8381515 100644
--- a/chrome/browser/geolocation/geolocation_browsertest.cc
+++ b/chrome/browser/geolocation/geolocation_browsertest.cc
@@ -386,14 +386,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, DISABLED_NoInfobarForSecondTab) {
CheckGeoposition(MockLocationProvider::instance_->position_);
}
-#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) {
+IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, NoInfobarForDeniedOrigin) {
ASSERT_TRUE(Initialize(INITIALIZATION_NONE));
current_browser_->profile()->GetGeolocationContentSettingsMap()->
SetContentSetting(current_url_, current_url_, CONTENT_SETTING_BLOCK);