summaryrefslogtreecommitdiffstats
path: root/base/containers
diff options
context:
space:
mode:
authormgiuca <mgiuca@chromium.org>2015-06-24 02:45:45 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-24 09:46:27 +0000
commitd6af321321aefb7c3fdca9b2acdbd638b51de9a7 (patch)
tree49e65595e262f016ed50407f6f201adc72fb4523 /base/containers
parent9e84be435f95ba43c9e476525c3df1ad41657b2b (diff)
downloadchromium_src-d6af321321aefb7c3fdca9b2acdbd638b51de9a7.zip
chromium_src-d6af321321aefb7c3fdca9b2acdbd638b51de9a7.tar.gz
chromium_src-d6af321321aefb7c3fdca9b2acdbd638b51de9a7.tar.bz2
Moved ScopedPtrMap into base namespace.
BUG=502128 TBR=reillyg@chromium.org Review URL: https://codereview.chromium.org/1194373002 Cr-Commit-Position: refs/heads/master@{#335895}
Diffstat (limited to 'base/containers')
-rw-r--r--base/containers/scoped_ptr_map.h4
-rw-r--r--base/containers/scoped_ptr_map_unittest.cc2
2 files changed, 6 insertions, 0 deletions
diff --git a/base/containers/scoped_ptr_map.h b/base/containers/scoped_ptr_map.h
index 259076f..a4605e3 100644
--- a/base/containers/scoped_ptr_map.h
+++ b/base/containers/scoped_ptr_map.h
@@ -14,6 +14,8 @@
#include "base/move.h"
#include "base/stl_util.h"
+namespace base {
+
// ScopedPtrMap provides a std::map that supports scoped_ptr values. It ensures
// that the map's values are properly deleted when removed from the map, or when
// the map is destroyed.
@@ -137,4 +139,6 @@ class ScopedPtrMap {
};
};
+} // namespace base
+
#endif // BASE_CONTAINERS_SCOPED_PTR_MAP_H_
diff --git a/base/containers/scoped_ptr_map_unittest.cc b/base/containers/scoped_ptr_map_unittest.cc
index 1d8f179..46843b3 100644
--- a/base/containers/scoped_ptr_map_unittest.cc
+++ b/base/containers/scoped_ptr_map_unittest.cc
@@ -13,6 +13,7 @@
#include "base/memory/scoped_ptr.h"
#include "testing/gtest/include/gtest/gtest.h"
+namespace base {
namespace {
// A ScopedDestroyer sets a Boolean to true upon destruction.
@@ -236,3 +237,4 @@ TEST(ScopedPtrMapTest, Passed) {
};
} // namespace
+} // namespace base