Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/wtf/DequeTest.cpp

Index: third_party/WebKit/Source/wtf/DequeTest.cpp
diff --git a/third_party/WebKit/Source/wtf/DequeTest.cpp b/third_party/WebKit/Source/wtf/DequeTest.cpp
index 8c6e360b7a3cbc4ed8b1124ce32057b896c40c53..114afbb929db1610dd332e308efffcd899af0f5f 100644
--- a/third_party/WebKit/Source/wtf/DequeTest.cpp
+++ b/third_party/WebKit/Source/wtf/DequeTest.cpp
@@ -27,7 +27,8 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/HashSet.h"
-#include "wtf/PtrUtil.h"
+#include "wtf/OwnPtr.h"
+#include "wtf/PassOwnPtr.h"
 #include <memory>
 
 namespace WTF {
@@ -177,11 +178,11 @@ void ownPtrTest()
 {
     int destructNumber = 0;
     OwnPtrDeque deque;
-    deque.append(wrapUnique(new DestructCounter(0, &destructNumber)));
-    deque.append(wrapUnique(new DestructCounter(1, &destructNumber)));
+    deque.append(adoptPtr(new DestructCounter(0, &destructNumber)));
+    deque.append(adoptPtr(new DestructCounter(1, &destructNumber)));
     EXPECT_EQ(2u, deque.size());
 
-    std::unique_ptr<DestructCounter>& counter0 = deque.first();
+    OwnPtr<DestructCounter>& counter0 = deque.first();
     EXPECT_EQ(0, counter0->get());
     int counter1 = deque.last()->get();
     EXPECT_EQ(1, counter1);
@@ -189,7 +190,7 @@ void ownPtrTest()
 
     size_t index = 0;
     for (auto iter = deque.begin(); iter != deque.end(); ++iter) {
-        std::unique_ptr<DestructCounter>& refCounter = *iter;
+        OwnPtr<DestructCounter>& refCounter = *iter;
         EXPECT_EQ(index, static_cast<size_t>(refCounter->get()));
         EXPECT_EQ(index, static_cast<size_t>((*refCounter).get()));
         index++;
@@ -198,7 +199,7 @@ void ownPtrTest()
 
     auto it = deque.begin();
     for (index = 0; index < deque.size(); ++index) {
-        std::unique_ptr<DestructCounter>& refCounter = *it;
+        OwnPtr<DestructCounter>& refCounter = *it;
         EXPECT_EQ(index, static_cast<size_t>(refCounter->get()));
         index++;
         ++it;
@@ -211,7 +212,7 @@ void ownPtrTest()
     EXPECT_EQ(1u, deque.size());
     EXPECT_EQ(1, destructNumber);
 
-    std::unique_ptr<DestructCounter> ownCounter1 = std::move(deque.first());
+    OwnPtr<DestructCounter> ownCounter1 = std::move(deque.first());
     deque.removeFirst();
     EXPECT_EQ(counter1, ownCounter1->get());
     EXPECT_EQ(0u, deque.size());
@@ -223,9 +224,9 @@ void ownPtrTest()
     size_t count = 1025;
     destructNumber = 0;
     for (size_t i = 0; i < count; ++i)
-        deque.prepend(wrapUnique(new DestructCounter(i, &destructNumber)));
+        deque.prepend(adoptPtr(new DestructCounter(i, &destructNumber)));
 
-    // Deque relocation must not destruct std::unique_ptr element.
+    // Deque relocation must not destruct OwnPtr element.
     EXPECT_EQ(0, destructNumber);
     EXPECT_EQ(count, deque.size());
 
@@ -241,8 +242,8 @@ void ownPtrTest()
 
 TEST(DequeTest, OwnPtr)
 {
-    ownPtrTest<Deque<std::unique_ptr<DestructCounter>>>();
-    ownPtrTest<Deque<std::unique_ptr<DestructCounter>, 2>>();
+    ownPtrTest<Deque<OwnPtr<DestructCounter>>>();
+    ownPtrTest<Deque<OwnPtr<DestructCounter>, 2>>();
 }
 
 class MoveOnly {