Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/wtf/HashMapTest.cpp

 /*
  * Copyright (C) 2011 Google 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/HashMap.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
+#include "wtf/OwnPtr.h"
+#include "wtf/PassOwnPtr.h"
 #include "wtf/PassRefPtr.h"
-#include "wtf/PtrUtil.h"
 #include "wtf/RefCounted.h"
 #include "wtf/Vector.h"
 #include <memory>
 
 namespace WTF {
 
 namespace {
 
 using IntHashMap = HashMap<int, int>;
 
@@ skipping 55 matching lines @@
     { }
 
     ~DestructCounter() { ++(*m_destructNumber); }
     int get() const { return m_i; }
 
 private:
     int m_i;
     int* m_destructNumber;
 };
 
-using OwnPtrHashMap = HashMap<int, std::unique_ptr<DestructCounter>>;
+using OwnPtrHashMap = HashMap<int, OwnPtr<DestructCounter>>;
 
 TEST(HashMapTest, OwnPtrAsValue)
 {
     int destructNumber = 0;
     OwnPtrHashMap map;
-    map.add(1, wrapUnique(new DestructCounter(1, &destructNumber)));
-    map.add(2, wrapUnique(new DestructCounter(2, &destructNumber)));
+    map.add(1, adoptPtr(new DestructCounter(1, &destructNumber)));
+    map.add(2, adoptPtr(new DestructCounter(2, &destructNumber)));
 
     DestructCounter* counter1 = map.get(1);
     EXPECT_EQ(1, counter1->get());
     DestructCounter* counter2 = map.get(2);
     EXPECT_EQ(2, counter2->get());
     EXPECT_EQ(0, destructNumber);
 
     for (OwnPtrHashMap::iterator iter = map.begin(); iter != map.end(); ++iter) {
-        std::unique_ptr<DestructCounter>& ownCounter = iter->value;
+        OwnPtr<DestructCounter>& ownCounter = iter->value;
         EXPECT_EQ(iter->key, ownCounter->get());
     }
     ASSERT_EQ(0, destructNumber);
 
-    std::unique_ptr<DestructCounter> ownCounter1 = map.take(1);
+    OwnPtr<DestructCounter> ownCounter1 = map.take(1);
     EXPECT_EQ(ownCounter1.get(), counter1);
     EXPECT_FALSE(map.contains(1));
     EXPECT_EQ(0, destructNumber);
 
     map.remove(2);
     EXPECT_FALSE(map.contains(2));
     EXPECT_EQ(0UL, map.size());
     EXPECT_EQ(1, destructNumber);
 
     ownCounter1.reset();
@@ skipping 97 matching lines @@
 }
 
 class SimpleClass {
 public:
     explicit SimpleClass(int v) : m_v(v) { }
     int v() { return m_v; }
 
 private:
     int m_v;
 };
-using IntSimpleMap = HashMap<int, std::unique_ptr<SimpleClass>>;
+using IntSimpleMap = HashMap<int, OwnPtr<SimpleClass>>;
 
 TEST(HashMapTest, AddResult)
 {
     IntSimpleMap map;
     IntSimpleMap::AddResult result = map.add(1, nullptr);
     EXPECT_TRUE(result.isNewEntry);
     EXPECT_EQ(1, result.storedValue->key);
     EXPECT_EQ(0, result.storedValue->value.get());
 
     SimpleClass* simple1 = new SimpleClass(1);
-    result.storedValue->value = wrapUnique(simple1);
+    result.storedValue->value = adoptPtr(simple1);
     EXPECT_EQ(simple1, map.get(1));
 
-    IntSimpleMap::AddResult result2 = map.add(1, wrapUnique(new SimpleClass(2)));
+    IntSimpleMap::AddResult result2 = map.add(1, adoptPtr(new SimpleClass(2)));
     EXPECT_FALSE(result2.isNewEntry);
     EXPECT_EQ(1, result.storedValue->key);
     EXPECT_EQ(1, result.storedValue->value->v());
     EXPECT_EQ(1, map.get(1)->v());
 }
 
 TEST(HashMapTest, AddResultVectorValue)
 {
     using IntVectorMap = HashMap<int, Vector<int>>;
     IntVectorMap map;
@@ skipping 394 matching lines @@
     EXPECT_EQ(130, oneThirty);
     iter = map.find(Pair(MoveOnly(13), -13));
     EXPECT_TRUE(iter == map.end());
 
     map.clear();
 }
 
 } // anonymous namespace
 
 } // namespace WTF