3 files changed, 3 insertions, 19 deletions
diff --git a/chrome/browser/geolocation/gateway_data_provider_common_unittest.cc b/chrome/browser/geolocation/gateway_data_provider_common_unittest.cc
index 82867a5..3566230 100644
--- a/chrome/browser/geolocation/gateway_data_provider_common_unittest.cc
+++ b/chrome/browser/geolocation/gateway_data_provider_common_unittest.cc
@@ -63,7 +63,7 @@ class MockGatewayPollingPolicy : public PollingPolicyInterface {
     ON_CALL(*this, PollingInterval())
         .WillByDefault(Return(1));
     ON_CALL(*this, NoRouterInterval())
-        .WillByDefault(Return(2));
+        .WillByDefault(Return(1));
   }
 
   // PollingPolicyInterface
@@ -134,7 +134,7 @@ TEST_F(GeolocationGatewayDataProviderCommonTest, StartThread) {
   EXPECT_CALL(*polling_policy_, PollingInterval())
       .Times(AtLeast(1));
   EXPECT_TRUE(provider_->StartDataProvider());
-  provider_->StopDataProvider();
+  main_message_loop_.Run();
   SUCCEED();
 }
 
diff --git a/chrome/browser/geolocation/wifi_data_provider_common_unittest.cc b/chrome/browser/geolocation/wifi_data_provider_common_unittest.cc
index 2b8390e..3cedeb5 100644
--- a/chrome/browser/geolocation/wifi_data_provider_common_unittest.cc
+++ b/chrome/browser/geolocation/wifi_data_provider_common_unittest.cc
@@ -143,7 +143,7 @@ TEST_F(GeolocationWifiDataProviderCommonTest, StartThread) {
   EXPECT_CALL(*polling_policy_, PollingInterval())
       .Times(AtLeast(1));
   EXPECT_TRUE(provider_->StartDataProvider());
-  provider_->StopDataProvider();
+  main_message_loop_.Run();
   SUCCEED();
 }
 
diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt
index 3fdaa7c..272c338 100644
--- a/tools/heapcheck/suppressions.txt
+++ b/tools/heapcheck/suppressions.txt
@@ -936,19 +936,3 @@
    fun:RunnableMethod::Run
    fun:MessageLoop::RunTask
 }
-{
-   bug_53573_a
-   Heapcheck:Leak
-   fun:CancelableTask* NewRunnableMethod
-   fun:DeviceDataProviderImplBase::NotifyListeners
-   fun:GatewayDataProviderCommon::DoRouterScanTask
-   fun:void DispatchToMethod
-   fun:ScopedRunnableMethodFactory::RunnableMethod::Run
-   fun:MessageLoop::RunTask
-}
-{
-   bug_53573_b
-   Heapcheck:Leak
-   ...
-   fun:GeolocationGatewayDataProviderCommonTest::SetUp
-}