summaryrefslogtreecommitdiffstats
path: root/chrome/browser/geolocation
diff options
context:
space:
mode:
authornsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-25 03:21:51 +0000
committernsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-25 03:21:51 +0000
commit6699f618856f4a9e2adc87437a6f411110fb031a (patch)
treefd9f695da430e801debf936a978ad7d451e942f7 /chrome/browser/geolocation
parenta7c5cb33013aafec946b2f9a58d5db6df5deaa4b (diff)
downloadchromium_src-6699f618856f4a9e2adc87437a6f411110fb031a.zip
chromium_src-6699f618856f4a9e2adc87437a6f411110fb031a.tar.gz
chromium_src-6699f618856f4a9e2adc87437a6f411110fb031a.tar.bz2
The GeolocationBrowserTest times out, and timeouts now causes the
tree to be green even for FLAKY and FAILS tests, so I am marking it as DISABLED. BUG=56033 Review URL: http://codereview.chromium.org/4043006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63700 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/geolocation')
-rw-r--r--chrome/browser/geolocation/geolocation_browsertest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc
index 255dad2..30510ac 100644
--- a/chrome/browser/geolocation/geolocation_browsertest.cc
+++ b/chrome/browser/geolocation/geolocation_browsertest.cc
@@ -516,7 +516,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, IFramesWithCachedPosition) {
// See http://crbug.com/56033
IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest,
- FLAKY_CancelPermissionForFrame) {
+ DISABLED_CancelPermissionForFrame) {
html_for_tests_ = "files/geolocation/iframes_different_origin.html";
ASSERT_TRUE(Initialize(INITIALIZATION_IFRAMES));
LOG(WARNING) << "frames loaded";