Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(261)

Unified Diff: third_party/WebKit/Source/wtf/HashSetTest.cpp

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/wtf/HashMapTest.cpp ('k') | third_party/WebKit/Source/wtf/HashTable.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/wtf/HashSetTest.cpp
diff --git a/third_party/WebKit/Source/wtf/HashSetTest.cpp b/third_party/WebKit/Source/wtf/HashSetTest.cpp
index bbe6990270db228e0814f00e8e2a60d1ad64344b..72cf66110b7235f02951cc2ede56eb11d8d053c9 100644
--- a/third_party/WebKit/Source/wtf/HashSetTest.cpp
+++ b/third_party/WebKit/Source/wtf/HashSetTest.cpp
@@ -95,7 +95,8 @@ TEST(HashSetTest, HashSetOwnPtr) {
{
// AddResult in a separate scope to avoid assertion hit,
// since we modify the container further.
- HashSet<std::unique_ptr<Dummy>>::AddResult res1 = set.add(wrapUnique(ptr1));
+ HashSet<std::unique_ptr<Dummy>>::AddResult res1 =
+ set.add(WTF::wrapUnique(ptr1));
EXPECT_EQ(ptr1, res1.storedValue->get());
}
@@ -107,7 +108,8 @@ TEST(HashSetTest, HashSetOwnPtr) {
Dummy* ptr2 = new Dummy(deleted2);
{
- HashSet<std::unique_ptr<Dummy>>::AddResult res2 = set.add(wrapUnique(ptr2));
+ HashSet<std::unique_ptr<Dummy>>::AddResult res2 =
+ set.add(WTF::wrapUnique(ptr2));
EXPECT_EQ(res2.storedValue->get(), ptr2);
}
@@ -128,8 +130,8 @@ TEST(HashSetTest, HashSetOwnPtr) {
deleted2 = false;
{
OwnPtrSet set;
- set.add(makeUnique<Dummy>(deleted1));
- set.add(makeUnique<Dummy>(deleted2));
+ set.add(WTF::makeUnique<Dummy>(deleted1));
+ set.add(WTF::makeUnique<Dummy>(deleted2));
}
EXPECT_TRUE(deleted1);
EXPECT_TRUE(deleted2);
@@ -142,8 +144,8 @@ TEST(HashSetTest, HashSetOwnPtr) {
ptr2 = new Dummy(deleted2);
{
OwnPtrSet set;
- set.add(wrapUnique(ptr1));
- set.add(wrapUnique(ptr2));
+ set.add(WTF::wrapUnique(ptr1));
+ set.add(WTF::wrapUnique(ptr2));
ownPtr1 = set.take(ptr1);
EXPECT_EQ(1UL, set.size());
ownPtr2 = set.takeAny();
« no previous file with comments | « third_party/WebKit/Source/wtf/HashMapTest.cpp ('k') | third_party/WebKit/Source/wtf/HashTable.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698