Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/wtf/HashSetTest.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
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * 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/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 {
 
 namespace {
 
 template<unsigned size> void testReserveCapacity();
 template<> void testReserveCapacity<0>() {}
 template<unsigned size> void testReserveCapacity()
 {
     HashSet<int> testSet;
@@ skipping 41 matching lines @@
         deleted = true;
     }
 
     bool& deleted;
 };
 
 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());
     }
 
     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);
     {
-        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);
     }
 
     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.take(ptr1);
         EXPECT_EQ(1UL, set.size());
         ownPtr2 = set.takeAny();
         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 DummyRefCounted : public RefCounted<DummyRefCounted> {
 public:
     DummyRefCounted(bool& isDeleted) : m_isDeleted(isDeleted) { m_isDeleted = false; }
     ~DummyRefCounted() { m_isDeleted = true; }
 
     void ref()
     {
         WTF::RefCounted<DummyRefCounted>::ref();
@@ skipping 328 matching lines @@
     EXPECT_TRUE(oneTwoThree.contains(3));
 
     // Other ways of construction: as a function parameter and in a return statement.
     EXPECT_TRUE(isOneTwoThree({1, 2, 3}));
     EXPECT_TRUE(isOneTwoThree(returnOneTwoThree()));
 }
 
 } // anonymous namespace
 
 } // namespace WTF