summaryrefslogtreecommitdiffstats
path: root/chrome/browser/geolocation
diff options
context:
space:
mode:
authordmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-27 02:40:02 +0000
committerdmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-27 02:40:02 +0000
commit629dfb26e24e824b8b02c7fa3f6ccfedd5634672 (patch)
tree7a1ce85f59ea3a33977eb511c0677e1910b34fde /chrome/browser/geolocation
parent8cfe6bbe1c2b6e82f19512ddb921833e9093f2ad (diff)
downloadchromium_src-629dfb26e24e824b8b02c7fa3f6ccfedd5634672.zip
chromium_src-629dfb26e24e824b8b02c7fa3f6ccfedd5634672.tar.gz
chromium_src-629dfb26e24e824b8b02c7fa3f6ccfedd5634672.tar.bz2
I accidentally disabled the wrong test earlier (it had a very similar name).
BUG=53472 TEST=Re-enables GeolocationWifiDataProviderCommonTest.IntermittentWifi, disables GeolocationGatewayDataProviderCommonTest.IntermittentWifi TBR=joth@chromium.org Review URL: http://codereview.chromium.org/3234001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57629 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/geolocation')
-rw-r--r--chrome/browser/geolocation/gateway_data_provider_common_unittest.cc3
-rw-r--r--chrome/browser/geolocation/wifi_data_provider_common_unittest.cc3
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/geolocation/gateway_data_provider_common_unittest.cc b/chrome/browser/geolocation/gateway_data_provider_common_unittest.cc
index 424353c..82867a5 100644
--- a/chrome/browser/geolocation/gateway_data_provider_common_unittest.cc
+++ b/chrome/browser/geolocation/gateway_data_provider_common_unittest.cc
@@ -138,7 +138,8 @@ TEST_F(GeolocationGatewayDataProviderCommonTest, StartThread) {
SUCCEED();
}
-TEST_F(GeolocationGatewayDataProviderCommonTest, IntermittentWifi){
+// Timed out at least once on Vista (dbg): http://crbug.com/53472
+TEST_F(GeolocationGatewayDataProviderCommonTest, DISABLED_IntermittentWifi){
EXPECT_CALL(*polling_policy_, PollingInterval())
.Times(AtLeast(1));
EXPECT_CALL(*polling_policy_, NoRouterInterval())
diff --git a/chrome/browser/geolocation/wifi_data_provider_common_unittest.cc b/chrome/browser/geolocation/wifi_data_provider_common_unittest.cc
index 1e1d6f9..2b8390e 100644
--- a/chrome/browser/geolocation/wifi_data_provider_common_unittest.cc
+++ b/chrome/browser/geolocation/wifi_data_provider_common_unittest.cc
@@ -156,8 +156,7 @@ TEST_F(GeolocationWifiDataProviderCommonTest, NoWifi){
main_message_loop_.Run();
}
-// Timed out at least once on Vista (dbg): http://crbug.com/53472
-TEST_F(GeolocationWifiDataProviderCommonTest, DISABLED_IntermittentWifi){
+TEST_F(GeolocationWifiDataProviderCommonTest, IntermittentWifi){
EXPECT_CALL(*polling_policy_, PollingInterval())
.Times(AtLeast(1));
EXPECT_CALL(*polling_policy_, NoWifiInterval())