diff options
| author | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-23 14:36:52 +0000 |
|---|---|---|
| committer | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-23 14:36:52 +0000 |
| commit | 4e7ca8180fd5bc9854d6c030960391dd985266b0 (patch) | |
| tree | de95b79cdfa897a0b8e7110db464e5213ba17595 /chrome/browser/geolocation | |
| parent | 91ae7e3014fc0fec5e480399dac574b1a07f0fe0 (diff) | |
| download | chromium_src-4e7ca8180fd5bc9854d6c030960391dd985266b0.zip chromium_src-4e7ca8180fd5bc9854d6c030960391dd985266b0.tar.gz chromium_src-4e7ca8180fd5bc9854d6c030960391dd985266b0.tar.bz2 | |
Re-enables some geolocation tests
(WebKit change has rolled and a flaky test seems to be stable).
TEST=GeolocationBrowserTest.*
BUG=40099
Review URL: http://codereview.chromium.org/1687002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45441 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/geolocation')
| -rw-r--r-- | chrome/browser/geolocation/geolocation_browsertest.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc index c238ba4..ed93f77 100644 --- a/chrome/browser/geolocation/geolocation_browsertest.cc +++ b/chrome/browser/geolocation/geolocation_browsertest.cc @@ -383,11 +383,12 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_ErrorOnPermissionDenied) { #define MAYBE_NoInfobarForSecondTab NoInfobarForSecondTab #endif -// TODO(joth): Fix test. http://crbug.com/40099 -IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, DISABLED_NoInfobarForSecondTab) { +IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_NoInfobarForSecondTab) { Initialize(INITIALIZATION_NONE); AddGeolocationWatch(true); SetInfobarResponse(current_url_, true); + // Disables further prompts from this tab. + CheckStringValueFromJavascript("false", "geoEnableAlerts(false)"); // Checks infobar will not be created a second tab. Initialize(INITIALIZATION_NEWTAB); @@ -462,9 +463,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_NoInfobarForOffTheRecord) { // http://crbug.com/29424 #define MAYBE_IFramesWithFreshPosition DISABLED_IFramesWithFreshPosition #else -// TODO(bulach): investigate this failure. -// http://build.chromium.org/buildbot/waterfall/builders/XP%20Tests/builds/18549/steps/browser_tests/logs/stdio -#define MAYBE_IFramesWithFreshPosition FLAKY_IFramesWithFreshPosition +#define MAYBE_IFramesWithFreshPosition IFramesWithFreshPosition #endif IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, @@ -512,9 +511,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, // 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 +#define MAYBE_IFramesWithCachedPosition IFramesWithCachedPosition #endif IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, |