summaryrefslogtreecommitdiffstats
path: root/base/observer_list_threadsafe.h
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-17 05:52:05 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-17 05:52:05 +0000
commit9022e8fff114ccebd12f9f57d240d10b9affca72 (patch)
tree4294668dca17b85d467c4a81bced2883ab52c835 /base/observer_list_threadsafe.h
parentfbb1a9c05d8f2a08f159d668f5dc74a5da4e3f6d (diff)
downloadchromium_src-9022e8fff114ccebd12f9f57d240d10b9affca72.zip
chromium_src-9022e8fff114ccebd12f9f57d240d10b9affca72.tar.gz
chromium_src-9022e8fff114ccebd12f9f57d240d10b9affca72.tar.bz2
base: Reuse STLDeleteValues() function to clean up the objects owned by ObserverListThreadSafe.
This simplifies the code in the destructor of ObserverListThreadSafe. TEST=base_unittests --gtest_filter=*Observer* R=darin@chromium.org Review URL: https://chromiumcodereview.appspot.com/12639010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188624 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/observer_list_threadsafe.h')
-rw-r--r--base/observer_list_threadsafe.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/base/observer_list_threadsafe.h b/base/observer_list_threadsafe.h
index 7322a1b..14488ec 100644
--- a/base/observer_list_threadsafe.h
+++ b/base/observer_list_threadsafe.h
@@ -16,6 +16,7 @@
#include "base/message_loop.h"
#include "base/message_loop_proxy.h"
#include "base/observer_list.h"
+#include "base/stl_util.h"
#include "base/threading/platform_thread.h"
///////////////////////////////////////////////////////////////////////////////
@@ -218,10 +219,7 @@ class ObserverListThreadSafe
};
~ObserverListThreadSafe() {
- typename ObserversListMap::const_iterator it;
- for (it = observer_lists_.begin(); it != observer_lists_.end(); ++it)
- delete (*it).second;
- observer_lists_.clear();
+ STLDeleteValues(&observer_lists_);
}
template <class Method, class Params>