[base] Replace Contains{Key,Value} with Contains in //base
This change replaces usages of base::ContainsKey and base::ContainsValue
with base::Contains in //base.
Bug: 970209
Change-Id: I7457bcfadd8501159d0a44a32b30e45cf4af7aca
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1646778
Reviewed-by: Daniel Cheng <[email protected]>
Commit-Queue: Jan Wilken Dörrie <[email protected]>
Cr-Commit-Position: refs/heads/master@{#667046}
diff --git a/base/scoped_generic_unittest.cc b/base/scoped_generic_unittest.cc
index f75adf0..73291a8 100644
--- a/base/scoped_generic_unittest.cc
+++ b/base/scoped_generic_unittest.cc
@@ -215,18 +215,18 @@
std::unordered_set<int> freed;
TrackedIntTraits traits(&freed, &owners);
-#define ASSERT_OWNED(value, owner) \
- ASSERT_TRUE(base::ContainsKey(owners, value)); \
- ASSERT_EQ(&owner, owners[value]); \
- ASSERT_FALSE(base::ContainsKey(freed, value))
+#define ASSERT_OWNED(value, owner) \
+ ASSERT_TRUE(base::Contains(owners, value)); \
+ ASSERT_EQ(&owner, owners[value]); \
+ ASSERT_FALSE(base::Contains(freed, value))
-#define ASSERT_UNOWNED(value) \
- ASSERT_FALSE(base::ContainsKey(owners, value)); \
- ASSERT_FALSE(base::ContainsKey(freed, value))
+#define ASSERT_UNOWNED(value) \
+ ASSERT_FALSE(base::Contains(owners, value)); \
+ ASSERT_FALSE(base::Contains(freed, value))
-#define ASSERT_FREED(value) \
- ASSERT_FALSE(base::ContainsKey(owners, value)); \
- ASSERT_TRUE(base::ContainsKey(freed, value))
+#define ASSERT_FREED(value) \
+ ASSERT_FALSE(base::Contains(owners, value)); \
+ ASSERT_TRUE(base::Contains(freed, value))
// Constructor.
{
