Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/wtf/ListHashSetTest.cpp

 /*
  * Copyright (C) 2012 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 10 matching lines @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "wtf/ListHashSet.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/LinkedHashSet.h"
 #include "wtf/PassRefPtr.h"
-#include "wtf/PtrUtil.h"
 #include "wtf/RefCounted.h"
 #include "wtf/RefPtr.h"
-#include <memory>
 #include <type_traits>
 
 namespace WTF {
 
 namespace {
 
 template <typename Set>
 class ListOrLinkedHashSetTest : public ::testing::Test { };
 
 using SetTypes = ::testing::Types<ListHashSet<int>, ListHashSet<int, 1>, LinkedHashSet<int>>;
@@ skipping 502 matching lines @@
         deleted = true;
     }
 
     bool& deleted;
 };
 
 TEST(ListHashSetTest, WithOwnPtr)
 {
     bool deleted1 = false, deleted2 = false;
 
-    typedef ListHashSet<std::unique_ptr<Dummy>> OwnPtrSet;
+    typedef ListHashSet<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.
-        OwnPtrSet::AddResult res1 = set.add(wrapUnique(ptr1));
+        OwnPtrSet::AddResult res1 = set.add(adoptPtr(ptr1));
         EXPECT_EQ(res1.storedValue->get(), ptr1);
     }
 
     EXPECT_FALSE(deleted1);
     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);
     {
-        OwnPtrSet::AddResult res2 = set.add(wrapUnique(ptr2));
+        OwnPtrSet::AddResult res2 = set.add(adoptPtr(ptr2));
         EXPECT_EQ(res2.storedValue->get(), ptr2);
     }
 
     EXPECT_FALSE(deleted2);
     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);
 
     set.clear();
     EXPECT_TRUE(deleted2);
     EXPECT_TRUE(set.isEmpty());
 
     deleted1 = false;
     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.takeFirst();
         EXPECT_EQ(1UL, set.size());
         ownPtr2 = set.take(ptr2);
         EXPECT_TRUE(set.isEmpty());
     }
     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 CountCopy final {
 public:
     static int* const kDeletedValue;
 
     explicit CountCopy(int* counter = nullptr) : m_counter(counter) { }
     CountCopy(const CountCopy& other) : m_counter(other.m_counter)
     {
         if (m_counter && m_counter != kDeletedValue)
@@ skipping 189 matching lines @@
     // ... but they don't have any pass-out (like take()) methods.
 
     set.remove(MoveOnly(3));
     set.clear();
 }
 
 
 } // anonymous namespace
 
 } // namespace WTF