Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/wtf/HashSetTest.cpp

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 2313b7c36a3c6d362b317064c9a08ea596d31c4a..d9497665690d32ea8281ac30f338f85a09a785e2 100644
--- a/third_party/WebKit/Source/wtf/HashSetTest.cpp
+++ b/third_party/WebKit/Source/wtf/HashSetTest.cpp
@@ -26,9 +26,9 @@
 #include "wtf/HashSet.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "wtf/PtrUtil.h"
+#include "wtf/OwnPtr.h"
+#include "wtf/PassOwnPtr.h"
 #include "wtf/RefCounted.h"
-#include <memory>
 
 namespace WTF {
 
@@ -90,14 +90,14 @@ TEST(HashSetTest, HashSetOwnPtr)
 {
     bool deleted1 = false, deleted2 = false;
 
-    typedef HashSet<std::unique_ptr<Dummy>> OwnPtrSet;
+    typedef HashSet<OwnPtr<Dummy>> OwnPtrSet;
     OwnPtrSet set;
 
     Dummy* ptr1 = new Dummy(deleted1);
     {
         // 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<OwnPtr<Dummy>>::AddResult res1 = set.add(adoptPtr(ptr1));
         EXPECT_EQ(ptr1, res1.storedValue->get());
     }
 
@@ -105,11 +105,11 @@ TEST(HashSetTest, HashSetOwnPtr)
     EXPECT_EQ(1UL, set.size());
     OwnPtrSet::iterator it1 = set.find(ptr1);
     EXPECT_NE(set.end(), it1);
-    EXPECT_EQ(ptr1, (*it1).get());
+    EXPECT_EQ(ptr1, (*it1));
 
     Dummy* ptr2 = new Dummy(deleted2);
     {
-        HashSet<std::unique_ptr<Dummy>>::AddResult res2 = set.add(wrapUnique(ptr2));
+        HashSet<OwnPtr<Dummy>>::AddResult res2 = set.add(adoptPtr(ptr2));
         EXPECT_EQ(res2.storedValue->get(), ptr2);
     }
 
@@ -117,7 +117,7 @@ TEST(HashSetTest, HashSetOwnPtr)
     EXPECT_EQ(2UL, set.size());
     OwnPtrSet::iterator it2 = set.find(ptr2);
     EXPECT_NE(set.end(), it2);
-    EXPECT_EQ(ptr2, (*it2).get());
+    EXPECT_EQ(ptr2, (*it2));
 
     set.remove(ptr1);
     EXPECT_TRUE(deleted1);
@@ -130,22 +130,22 @@ TEST(HashSetTest, HashSetOwnPtr)
     deleted2 = false;
     {
         OwnPtrSet set;
-        set.add(wrapUnique(new Dummy(deleted1)));
-        set.add(wrapUnique(new Dummy(deleted2)));
+        set.add(adoptPtr(new Dummy(deleted1)));
+        set.add(adoptPtr(new Dummy(deleted2)));
     }
     EXPECT_TRUE(deleted1);
     EXPECT_TRUE(deleted2);
 
     deleted1 = false;
     deleted2 = false;
-    std::unique_ptr<Dummy> ownPtr1;
-    std::unique_ptr<Dummy> ownPtr2;
+    OwnPtr<Dummy> ownPtr1;
+    OwnPtr<Dummy> ownPtr2;
     ptr1 = new Dummy(deleted1);
     ptr2 = new Dummy(deleted2);
     {
         OwnPtrSet set;
-        set.add(wrapUnique(ptr1));
-        set.add(wrapUnique(ptr2));
+        set.add(adoptPtr(ptr1));
+        set.add(adoptPtr(ptr2));
         ownPtr1 = set.take(ptr1);
         EXPECT_EQ(1UL, set.size());
         ownPtr2 = set.takeAny();
@@ -154,8 +154,8 @@ TEST(HashSetTest, HashSetOwnPtr)
     EXPECT_FALSE(deleted1);
     EXPECT_FALSE(deleted2);
 
-    EXPECT_EQ(ptr1, ownPtr1.get());
-    EXPECT_EQ(ptr2, ownPtr2.get());
+    EXPECT_EQ(ptr1, ownPtr1);
+    EXPECT_EQ(ptr2, ownPtr2);
 }
 
 class DummyRefCounted : public RefCounted<DummyRefCounted> {