diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-15 16:49:13 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-15 16:49:13 +0000 |
| commit | 4e6d7cdc102ce87cf9dbeaf064f1e957816de7a7 (patch) | |
| tree | 96cb198e8ed9160a3ab71cf803c711d1e882264e | |
| parent | adfee59f425af70379fd78e6fe0c9cceffe3ff39 (diff) | |
| download | chromium_src-4e6d7cdc102ce87cf9dbeaf064f1e957816de7a7.zip chromium_src-4e6d7cdc102ce87cf9dbeaf064f1e957816de7a7.tar.gz chromium_src-4e6d7cdc102ce87cf9dbeaf064f1e957816de7a7.tar.bz2 | |
Revert 59507 - NoInfobarForDeniedOrigin no longer appears flaky (last seen July 10)
Committed due to git branch error
TBR=joth@chromium.org
Review URL: http://codereview.chromium.org/3437003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59509 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/geolocation/geolocation_browsertest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc index 8381515..a658f56 100644 --- a/chrome/browser/geolocation/geolocation_browsertest.cc +++ b/chrome/browser/geolocation/geolocation_browsertest.cc @@ -386,7 +386,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); |