Change ScopedPtrHashMap's 2nd template parameter

base/containers/scoped_ptr_hash_map_unittest.cc

+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "base/containers/scoped_ptr_hash_map.h"
+
+#include "base/memory/scoped_ptr.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace base {
+

[danakj, 2015/04/24 17:22:04]

can you wrap everything inside this namespace with an anonymous namespace too?

[kcwu, 2015/04/27 13:28:03]

Done.
base::DefaultDeleter have to be specialized inside namespace base. Please let me
know how to make it look better if possible.

[danakj, 2015/04/27 16:50:09]

I meant wrap it all like:

namespace base {
namespace {

.. all the tests ..

}
}

You can use a custom deleter on the scoped_ptr instead of DefaultDeleter though?

[kcwu, 2015/04/27 17:48:17]

Done.
That doesn't work for DefaultDeleter (compile failed). Changed to custom
deleter.

+struct DeleteCounter {
+ public:
+  DeleteCounter() {}
+  ~DeleteCounter() { g_delete_count++; }
+
+  static void ResetCounter() { g_delete_count = 0; }
+  static int delete_count() { return g_delete_count; }
+
+ private:
+  static int g_delete_count;
+};
+
+template <>
+struct DefaultDeleter<DeleteCounter> {
+ public:
+  inline void operator()(DeleteCounter* ptr) const {
+    g_count++;
+    delete ptr;
+  }
+
+  static int count() { return g_count; }
+  static void ResetCounter() { g_count = 0; }
+
+ private:
+  static int g_count;

[danakj, 2015/04/24 17:22:04]

g_deleter_call_count?

[kcwu, 2015/04/27 13:28:03]

Done.

+};
+
+int DeleteCounter::g_delete_count = 0;
+int DefaultDeleter<DeleteCounter>::g_count = 0;
+
+}  // namespace

[danakj, 2015/04/24 17:22:04]

this isn't closing an anonymous namespace. i think you mean "namespace base",
but can you wrap the tests in it too?

[kcwu, 2015/04/27 13:28:03]

Done.

+
+TEST(ScopedPtrHashMapTest, CustomDeleter) {
+  int key = 123;
+  base::DeleteCounter::ResetCounter();
+  base::DefaultDeleter<base::DeleteCounter>::ResetCounter();
+  {
+    base::ScopedPtrHashMap<int, scoped_ptr<base::DeleteCounter>> map;
+    map.set(key, scoped_ptr<base::DeleteCounter>(new base::DeleteCounter));
+  }
+  EXPECT_EQ(1, base::DeleteCounter::delete_count());
+  EXPECT_EQ(1, base::DefaultDeleter<base::DeleteCounter>::count());
+
+  base::DeleteCounter::ResetCounter();
+  base::DefaultDeleter<base::DeleteCounter>::ResetCounter();
+  {
+    base::ScopedPtrHashMap<int, scoped_ptr<base::DeleteCounter>> map;
+    map.erase(
+        map.set(key, scoped_ptr<base::DeleteCounter>(new base::DeleteCounter)));
+    EXPECT_EQ(1, base::DeleteCounter::delete_count());
+    EXPECT_EQ(1, base::DefaultDeleter<base::DeleteCounter>::count());
+  }
+  EXPECT_EQ(1, base::DeleteCounter::delete_count());
+  EXPECT_EQ(1, base::DefaultDeleter<base::DeleteCounter>::count());
+
+  base::DeleteCounter::ResetCounter();
+  base::DefaultDeleter<base::DeleteCounter>::ResetCounter();
+  {
+    base::ScopedPtrHashMap<int, scoped_ptr<base::DeleteCounter>> map;
+    map.set(key, scoped_ptr<base::DeleteCounter>(new base::DeleteCounter));
+    map.set(key, scoped_ptr<base::DeleteCounter>(new base::DeleteCounter));
+    map.set(key, scoped_ptr<base::DeleteCounter>(new base::DeleteCounter));
+    EXPECT_EQ(2, base::DeleteCounter::delete_count());
+    EXPECT_EQ(2, base::DefaultDeleter<base::DeleteCounter>::count());
+  }
+  EXPECT_EQ(3, base::DeleteCounter::delete_count());
+  EXPECT_EQ(3, base::DefaultDeleter<base::DeleteCounter>::count());
+}

[danakj, 2015/04/24 17:22:04]

can you test erase() too?

[kcwu, 2015/04/27 13:28:03]

It is already tested in the second block.