summaryrefslogtreecommitdiffstats
path: root/chrome/browser/geolocation
diff options
context:
space:
mode:
authorabodenha@google.com <abodenha@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-29 00:36:38 +0000
committerabodenha@google.com <abodenha@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-29 00:36:38 +0000
commitc6601a0c9ecf625d78e05b9878655a8242809645 (patch)
tree8763829cd475526adbb68815001adde574002fd8 /chrome/browser/geolocation
parentf221002832abe2c21f8b7c6a94da313b07957f50 (diff)
downloadchromium_src-c6601a0c9ecf625d78e05b9878655a8242809645.zip
chromium_src-c6601a0c9ecf625d78e05b9878655a8242809645.tar.gz
chromium_src-c6601a0c9ecf625d78e05b9878655a8242809645.tar.bz2
Revert 129439 - Reenable GeolocationBrowserTest.TabDestroyed browser test.
This test started to crash and, as a result of fixing the crash, the geolocation infobar code was refactored and improved in http://codereview.chromium.org/9491009 . Hopefully as a result, this test also no longer be flaky. BUG=70588 TEST=GeolocationBrowserTest.TabDestroyed Review URL: http://codereview.chromium.org/9874016 TBR=jknotten@chromium.org Review URL: https://chromiumcodereview.appspot.com/9800002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129538 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/geolocation')
-rw-r--r--chrome/browser/geolocation/geolocation_browsertest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc
index 4dbb890..e4f4380 100644
--- a/chrome/browser/geolocation/geolocation_browsertest.cc
+++ b/chrome/browser/geolocation/geolocation_browsertest.cc
@@ -648,7 +648,8 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, TwoWatchesInOneFrame) {
CheckGeoposition(final_position_latitude, final_position_longitude);
}
-IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, TabDestroyed) {
+// Hangs flakily, http://crbug.com/70588.
+IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, DISABLED_TabDestroyed) {
html_for_tests_ = "files/geolocation/tab_destroyed.html";
ASSERT_TRUE(Initialize(INITIALIZATION_IFRAMES));
LoadIFrames(3);