summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorrlp@chromium.org <rlp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-11 22:47:40 +0000
committerrlp@chromium.org <rlp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-11 22:47:40 +0000
commitd1199fa18e9cb795b5b88a537aef9e0327cbcabf (patch)
treeafb6eebdbccfdacbfc6be478ba3c702559cff85d /chrome
parentf45f79fcfb51d3bd5a1b8f5d75b9faddfc474de6 (diff)
downloadchromium_src-d1199fa18e9cb795b5b88a537aef9e0327cbcabf.zip
chromium_src-d1199fa18e9cb795b5b88a537aef9e0327cbcabf.tar.gz
chromium_src-d1199fa18e9cb795b5b88a537aef9e0327cbcabf.tar.bz2
Adding a RunAllPending to shortcuts_provider_unittest to fix heapcheck leaks in ShortcutsProviderTest in the case where threads are still holding on to the meassage loop.
BUG=131668 TEST=heapcheck TBR=nico@chromium.org Review URL: https://chromiumcodereview.appspot.com/10539077 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141540 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/autocomplete/shortcuts_provider_unittest.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/autocomplete/shortcuts_provider_unittest.cc b/chrome/browser/autocomplete/shortcuts_provider_unittest.cc
index 097f70c..3e74385 100644
--- a/chrome/browser/autocomplete/shortcuts_provider_unittest.cc
+++ b/chrome/browser/autocomplete/shortcuts_provider_unittest.cc
@@ -182,6 +182,9 @@ void ShortcutsProviderTest::SetUp() {
}
void ShortcutsProviderTest::TearDown() {
+ // Run all pending tasks or else some threads hold on to the message loop
+ // and prevent it from being deleted.
+ message_loop_.RunAllPending();
provider_ = NULL;
}