| Index: third_party/WebKit/Source/wtf/ListHashSetTest.cpp
|
| diff --git a/third_party/WebKit/Source/wtf/ListHashSetTest.cpp b/third_party/WebKit/Source/wtf/ListHashSetTest.cpp
|
| index 1c309449d0b0753a848f15fa4f2b7cb433697406..9c1172205184c3373311f44b01074c7eef802670 100644
|
| --- a/third_party/WebKit/Source/wtf/ListHashSetTest.cpp
|
| +++ b/third_party/WebKit/Source/wtf/ListHashSetTest.cpp
|
| @@ -551,7 +551,7 @@ TEST(ListHashSetTest, WithOwnPtr) {
|
| {
|
| // AddResult in a separate scope to avoid assertion hit,
|
| // since we modify the container further.
|
| - OwnPtrSet::AddResult res1 = set.add(wrapUnique(ptr1));
|
| + OwnPtrSet::AddResult res1 = set.add(WTF::wrapUnique(ptr1));
|
| EXPECT_EQ(res1.storedValue->get(), ptr1);
|
| }
|
|
|
| @@ -563,7 +563,7 @@ TEST(ListHashSetTest, WithOwnPtr) {
|
|
|
| Dummy* ptr2 = new Dummy(deleted2);
|
| {
|
| - OwnPtrSet::AddResult res2 = set.add(wrapUnique(ptr2));
|
| + OwnPtrSet::AddResult res2 = set.add(WTF::wrapUnique(ptr2));
|
| EXPECT_EQ(res2.storedValue->get(), ptr2);
|
| }
|
|
|
| @@ -584,8 +584,8 @@ TEST(ListHashSetTest, WithOwnPtr) {
|
| 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);
|
| @@ -598,8 +598,8 @@ TEST(ListHashSetTest, WithOwnPtr) {
|
| 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.takeFirst();
|
| EXPECT_EQ(1UL, set.size());
|
| ownPtr2 = set.take(ptr2);
|
|
|