diff options
| -rw-r--r-- | chrome/browser/sync/profile_sync_service_unittest.cc | 4 | ||||
| -rw-r--r-- | tools/valgrind/memcheck/suppressions.txt | 39 |
2 files changed, 4 insertions, 39 deletions
diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc index 8d2f535..892c96d 100644 --- a/chrome/browser/sync/profile_sync_service_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_unittest.cc @@ -8,6 +8,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "base/command_line.h" +#include "base/message_loop.h" #include "base/string_util.h" #include "base/string16.h" #include "chrome/browser/bookmarks/bookmark_model.h" @@ -279,6 +280,9 @@ class ProfileSyncServiceTest : public testing::Test { // Kill the service before the profile. service_.reset(); profile_.reset(); + + // Ensure that the sync objects destruct to avoid memory leaks. + MessageLoop::current()->RunAllPending(); } ModelAssociator* associator() { diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt index 903a4fd..4e5b325 100644 --- a/tools/valgrind/memcheck/suppressions.txt +++ b/tools/valgrind/memcheck/suppressions.txt @@ -1085,42 +1085,3 @@ fun:_ZN9Extension25LoadExtensionActionHelperEPK15DictionaryValuePSs fun:_ZN39ExtensionTest_LoadPageActionHelper_Test8TestBodyEv } -{ - bug_26493 - Memcheck:Leak - fun:_Znw* - fun:_ZN12browser_sync6SyncerC1EPN8syncable16DirectoryManagerERKSsPNS_23ServerConnectionManagerEPNS_15ModelSafeWorkerE - fun:_ZN12browser_sync12SyncerThread27HandleDirectoryManagerEventERKN8syncable21DirectoryManagerEventE - fun:_ZN12SimpleHookupI12EventChannelIN8syncable21DirectoryManagerEventE4Lock8AutoLockES2_N12browser_sync12SyncerThreadEMS7_FvRKS2_EE8CallbackES9_ - fun:_ZN23EventListenerHookupImplI12EventChannelIN8syncable21DirectoryManagerEventE4Lock8AutoLockES2_12SimpleHookupIS5_S2_N12browser_sync12SyncerThreadEMS8_FvRKS2_EEE11HandleEventESA_ - fun:_ZN12EventChannelIN8syncable21DirectoryManagerEventE4Lock8AutoLockE15NotifyListenersERKS1_ - fun:_ZN8syncable16DirectoryManager4OpenERKSs - fun:_ZN8sync_api11SyncManager12SyncInternal16SetupForTestModeEPKt - fun:_ZN8sync_api11SyncManager16SetupForTestModeEPKt - fun:_ZN12browser_sync15SyncBackendHost4Core19DoInitializeForTestEPNS_19BookmarkModelWorkerERKSbIwSt11char_traitsIwESaIwEEPN8sync_api23HttpPostProviderFactoryESC_ - fun:_Z16DispatchToMethodIN12browser_sync15SyncBackendHost4CoreEMS2_FvPNS0_19BookmarkModelWorkerERKSbIwSt11char_traitsIwESaIwEEPN8sync_api23HttpPostProviderFactoryESD_ES4_S8_SD_SD_EvPT_T0_RK6Tuple4IT1_T2_T3_T4_E - fun:_ZN14RunnableMethodIN12browser_sync15SyncBackendHost4CoreEMS2_FvPNS0_19BookmarkModelWorkerERKSbIwSt11char_traitsIwESaIwEEPN8sync_api23HttpPostProviderFactoryESD_E6Tuple4IS4_S8_SD_SD_EE3RunEv - fun:_ZN11MessageLoop7RunTaskEP4Task - fun:_ZN11MessageLoop21DeferOrRunPendingTaskERKNS_11PendingTaskE - fun:_ZN11MessageLoop6DoWorkEv - fun:_ZN4base18MessagePumpDefault3RunEPNS_11MessagePump8DelegateE - fun:_ZN11MessageLoop11RunInternalEv - fun:_ZN11MessageLoop10RunHandlerEv -} -{ - bug_26493 - Memcheck:Leak - fun:_Znw* - fun:_ZN9__gnu_cxx13new_allocatorIN21NotificationRegistrar6RecordEE8allocateEjPKv - fun:_ZNSt12_Vector_baseIN21NotificationRegistrar6RecordESaIS1_EE11_M_allocateEj - fun:_ZNSt6vectorIN21NotificationRegistrar6RecordESaIS1_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_ - fun:_ZNSt6vectorIN21NotificationRegistrar6RecordESaIS1_EE9push_backERKS1_ - fun:_ZN21NotificationRegistrar3AddEP20NotificationObserver16NotificationTypeRK18NotificationSource - fun:_ZN12browser_sync139_GLOBAL__N__b_slave_chromium_rel_linux_valgrind_builder_build_src_chrome_browser_sync_util_extensions_activity_monitor.cc_00000000_90D7379F16RegistrationTask3RunEv - fun:_ZN11MessageLoop7RunTaskEP4Task - fun:_ZN11MessageLoop21DeferOrRunPendingTaskERKNS_11PendingTaskE - fun:_ZN11MessageLoop6DoWorkEv - fun:_ZN4base18MessagePumpDefault3RunEPNS_11MessagePump8DelegateE - fun:_ZN11MessageLoop11RunInternalEv - fun:_ZN11MessageLoop10RunHandlerEv -} |